camera yaw and stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	BaseApplication.cpp
	map1.txt