Huge client cleanup
Merge branch 'master' of https://github.com/RoleplayIT/roleplayit

Conflicts:
	client/js/game.js

@Hilliean: don't commit questions, use github code commenting feature instead. Besides there were no life choices to be questioned since you already knew it was random code sticked together :D