main loop
Merge remote-tracking branch 'origin/master'

Conflicts:
	Source/App.cpp
	Source/App.hpp