Merge branch 'move_map_engine' (NOT FINISHED!)

Conflicted files checkouted from move_map_engine branch.
Still requiring manual merge of master branch changes.

Conflicts:
	src/engine/engine.cpp
	src/engine/engine.h
	src/map/mapengine.h
	src/ui/mainwindow.cpp
	src/ui/mainwindow.h
	src/ui/mapviewscreen.cpp

diff --cc src/src.pro
Simple merge