coding style
Merge branch 'master' of github.com:perpetual-mobile/PerpetualEngine

Conflicts:
	PerpetualEngine.sln