will solve httpparty problem in morning
Merge branch 'dev'
Merge branch 'dev'

Conflicts:
	Gemfile
welcome httpparty