Fixed indentation
Merge branch 'master' into dev

Conflicts:
	base/templates/member_profile.html