Merge branch 'hotfix/20141218-wemade'
gamewith
Merge branch 'hotfix/20141219-gamewith' into develop