Committing minor changes
Merge branch 'master' of https://github.com/LinkCable/24GoogleSecurity

Conflicts:
	website/game.js
Halfway with pagoamigo
fixed transactionFacebook conflict