Adjust main loop
Merge branch 'master' of github.com:haxenme/NME
Revert "Merge branch 'master' of github.com:haxenme/NME"

This reverts commit c8a454eede07f066aa02c17b6712f74ad9bdde3a, reversing
changes made to f8d8cef136de4a35b904a79853ba321de515d853.
Main loop, Timer.stamp fixes
Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	templates/default/haxe/ApplicationMain.hx