res fix
Merge branch 'master' of https://github.com/hashtagcharity/platform