With dev server setup
Merge branch 'master' of github.com:sramanujan/FightWithFriends into dev_sramanujan
Previous commit was incomplete...