Conflicts: apps/openmw/engine.cpp - fixed code that did not compile - removed tons of tabs - more clean up