Debug cleanup
Merge branch 'develop' into misc/qt5

Conflicts:
	source/glutils/glresourcemanager.cpp
	source/modules/airporttracker.cpp
	source/ui/userinterface.cpp
	source/vatsimdata/client/controller.cpp
	source/vatsinatorapplication.cpp
Bump
Merge branch 'misc/qt5' into ports/android