Fightlogic
changes
Merge branch 'dev_anpatel' of https://github.com/sramanujan/FightWithFriends into dev_anpatel

Conflicts:
	protected/player.js
merge conflict resolution