Fix of Merge versions (Previously done)
-
Merge branch 'master' of https://github.com/Avangarde/crystal-crush

Conflicts:
	crystal-crush/public_html/js/ScorePanel.js
Merge Bugs Patch #2