Merge branch 'hotfix/20140820-whitelocal'
thisisgame.com
Merge branch 'hotfix/20140821-thisigame' into develop