Merge branch 'hotfix/20140707-gamebanana'
playtomic
Merge branch 'hotfix/20140708-playtomic' into develop