re added httparty
Merge branch 'dev'