Merge branch 'hotfix/20141020-gb'
buzznews
Merge branch 'hotfix/20141029-buzznews' into develop