Fixes #101
Merge remote-tracking branch 'origin/master'

Conflicts:
	static/js/profile.js