Merge branch 'hotfix/20140510-ustream'
4gamer.net
Merge branch 'hotfix/20150510-4gamer' into develop