Merge branch 'develop'
Merge branch 'develop'
Support SEO fields properly for CMS pages
Merge branch 'hotfix/cms_seo_fields_support'
Rename nav and nav-white => Subheader to avoid confusion:  it's neither used as a nav  element, nor white...
Don't show unfan link for other people's profile
Merge branch 'hotfix/refactor_nav' into develop

Conflicts:
	apps/member/templates/userena/profile_base.html
	apps/member/templates/userena/profile_list.html