Merge branch 'master' of https://github.com/adriansonline/VanillaForums-Plugin-Reddit into develop
Merge branch 'develop'