work in progress
buccia patch 😀
Merge remote-tracking branch 'origin/refacto'

Conflicts:
	app/js/helpers.js
	app/js/site/profile/ProfileRoute.js
1.6.0