merge
Merge branch 'master' of github.com:web-rider/game_dev

Conflicts:
	protected/runtime/application.log