profile
Merge remote-tracking branch 'origin/master'

Conflicts:
	Jingo/static/js/profile.js
profile