Merge branch 'hotfix/20140627-cv'
gamemaps
Merge branch 'hotfix/20140630-gamemaps' into develop