Merge
Merge branch 'dev' of https://github.com/redliontom/ProjectHub into dev

Conflicts:
	app/config/http.js