on javascript fb mode
Merge branch 'master' of https://github.com/scalaberch/capturethecreature

Conflicts:
	App/www/js/game.js