Merge branch 'hotfix/20140610-fezero'
thegame
Merge branch 'hotfix/20140610-thegame' into develop