upd
Merge branch 'master' of https://github.com/hedunky/sails-ho

Conflicts:
	Client/player.js