stuff.
Merge branch 'master' into engine

Conflicts:
	game.cpp
Merge branch 'master' into engine
changes to unit and lua_unit.