Standard ApplicationMain
Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	templates/default/haxe/ApplicationMain.hx
Merge branch 'master' of github.com:haxenme/NME

Conflicts:
	tools/unit-test/NMETest.tpl.nmml
	tools/unit-test/nmetest/TestBase.hx
	tools/unit-test/nmetest/TestRunner.hx
Merge branch 'master' of github.com:haxenme/NME
Merge branch 'master' of github.com:haxenme/NME

Conflicts:
	tools/command-line/src/platforms/FlashPlatform.hx
	tools/project/NMEProject.hx
	tools/project/NMMLParser.hx
Merge branch 'master' of github.com:haxenme/NME
Merge branch 'master' of github.com:haxenme/NME
Merge branch 'master' of github.com:haxenme/NME
Merge branch 'master' of github.com:haxenme/NME
Merge branch 'master' of github.com:haxenme/NME
Merge branch 'master' of github.com:haxenme/NME
Merge branch 'master' of github.com:haxenme/NME
Merge branch 'master' of github.com:haxenme/NME
Added typedefs for GL
Add Tilesheet, enable Stage3D, add Shader3D
Merge branch 'master' of github.com:haxenme/NME

Conflicts:
	browser/utils/Timer.hx
Merge branch 'master' of github.com:haxenme/NME
Add Int32Array
Merge branch 'master' of https://github.com/pazudev/pazu-native