Merge branch 'hotfix/20140618-comicimg'
atgames
Merge branch 'hotfix/20140627-atgames' into develop