Merge branch 'hotfix/hvad_mig_again'
Remove several hundred sql queries from member app causing slowdown when counting/displaying members
Merge branch 'hotfix/workgroup_slowdown_fix'
Merge branch 'hotfix/workgroup_slowdown_fix' into develop
Add some rel='nofollow' so google doesn't get lost in the different sort options of project needs
Add some rel='nofollow' so google doesn't get lost in the different sort options of forum
Merge branch 'hotfix/google_nofollow' into develop
Merge remote-tracking branch 'upstream/develop' into feature/specific-questions

Conflicts:
	apps/project_sheet/templates/project_questions/page/question_thread.html
	apps/project_support/templates/project_support/project_support_list.html