Merge origin/master

Conflicts:
	crystal-crush/public_html/js/Levels/Level.js
	crystal-crush/public_html/js/Levels/Lvl1.js
	crystal-crush/public_html/js/Levels/Lvl2.js
	crystal-crush/public_html/js/Levels/Lvl3.js
	crystal-crush/public_html/js/Lvl_panels/AlchemyPanel.js
	crystal-crush/public_html/js/Lvl_panels/GamePanel.js
	crystal-crush/public_html/js/Lvl_panels/OptionPanel.js
	crystal-crush/public_html/js/Lvl_panels/PopUpPanel.js
	crystal-crush/public_html/js/Lvl_panels/RecipesPanel.js
	crystal-crush/public_html/js/Lvl_panels/ScorePanel.js
	crystal-crush/public_html/js/Lvl_panels/WelcomePopUp.js
	crystal-crush/public_html/js/Preloader.js
	crystal-crush/public_html/js/variables.js
Merge origin/master

Conflicts:
	crystal-crush/public_html/js/Lvl_panels/PopUpPanel.js
	crystal-crush/public_html/js/Lvl_panels/RecipesPanel.js
info panels
Merge origin/master
Version super hiper mega terminada
Merge origin/master

Conflicts:
	crystal-crush/public_html/js/Languages/Language.js
	crystal-crush/public_html/js/Preloader.js
super hiper duper final version