attempt correcting encoding issue
Merge branch 'develop' of ssh://git@github.com/mozvip/CouchPotatoServer.git into develop