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'
Merge branch 'hotfix/refactor_nav' into develop

Conflicts:
	apps/member/templates/userena/profile_base.html
	apps/member/templates/userena/profile_list.html
Fix #505 (get search results from content in all languages), #1513 (duplicate results + wrong language)
Fixed #1562 (tag page broken) and index status field for projects
Index the content of project sheet answers as part of the document, as it's most of the actual text of project sheets...
Finish fixing #1592 (wrong people were shown on tag page)
Fix #1564: Multisite was not obeyed in new search engine
Merge branch 'hotfix/search_engine_hotfix_2013-06'
Merge branch 'hotfix/search_engine_hotfix_2013-06' into develop
The commonecoute repository of cmsplugin-facebook disapeared.  Maintain our own fork
Merge branch 'hotfix/cmsplugin_facebook_repo_disapeared'
Merge branch 'hotfix/cmsplugin_facebook_repo_disapeared' into develop
Make new projects clickable on tag page and add counts where available
Merge branch 'hotfix/new_project_tag_fix'