Fixed linker error
Fix textures being rotated
Merge branch 'master' into qt

Conflicts:
	Makefile
	src/physics/object.cpp
Update qmake settings and project files