Image info Salt
Merge branch 'master' of https://github.com/Avangarde/crystal-crush

Conflicts:
	crystal-crush/public_html/js/Lvl_panels/GamePanel.js
Merge branch 'master' of https://github.com/Avangarde/crystal-crush

Conflicts:
	crystal-crush/public_html/js/Lvl_panels/GamePanel.js
Merge branch 'master' of https://github.com/Avangarde/crystal-crush
Merge branch 'master' of https://github.com/Avangarde/crystal-crush

Conflicts:
	crystal-crush/public_html/js/Lvl_panels/Preloader.js
Merge branch 'master' of https://github.com/Avangarde/crystal-crush

Conflicts:
	crystal-crush/public_html/js/Preloader.js