gamelogic v0.7.3
Merge branch 'master' of https://github.com/abbadoh/prettyGame

Conflicts:
	public/js/models/gamecanvas.js