Keep track of score
Merge branch 'gabriel'

Conflicts:
	Pelada/public/js/desktop_core_functions.js
	Pelada/public/js/desktop_effects.js
add sound + planet
Merge branch 'master' of https://github.com/gianordoli/dynamic_interfaces

Conflicts:
	Pelada/public/js/desktop_effects.js
Merge branch 'dev-score'

Conflicts:
	Pelada/public/js/desktop_control.js
Merge branch 'master' of https://github.com/gianordoli/dynamic_interfaces

Conflicts:
	Pelada/public/js/desktop_effects.js
no message
Merge commit '48f58a3b6e7f87c4b5d1177dffc4890f852154d9'

Conflicts:
	Pelada/public/js/desktop_control.js
	Pelada/public/js/desktop_effects.js
Merged effects into master
Merge branch 'dev-apon' of https://github.com/gianordoli/dynamic_interfaces

Conflicts:
	Pelada/public/js/desktop_control.js
Solved conflicts