Fixed botched merge.
Got Qt5.2.1 working on linux
Merge remote-tracking branch 'origin/master' into develop

Conflicts:
	CMakeLists.txt
	src/Logger.h