Merge branch 'hotfix/20140627-atgames'
http://cv.bngames.net/
Merge branch 'hotfix/20140627-cv' into develop