Merge branch 'develop' into feature/ldap-authentication
Add explicit permissions for the editor/moderator groups to edit snippets
Merge branch 'feature/snippetpermission' into develop
copying and pasting comments into new functions where those comments are untrue is bad, mmkay?
Fixed ordering of page types when a content type starts with a capital letter
Merge branch 'develop' of github.com:torchbox/verdant-rca into develop
enforce permissions within snippets area
Move main verdantadmin nav to a template tag; show/hide snippets item depending on permissions
Merge branch 'feature/snippetpermission' into develop
Lock down items in 'more' to administrators only (NB currently using made-up permissions in permission_required decorators, to effectively behave as 'superuser required')
Fixed filter styles on InnovationRCA Index
InnovationRCA projects now display other projects rather than research items
Added indexed_fields and search_name to ResearchStudentIndex
Use page models verbose_name instead of content_type name
Research on ResearchItems is now paginated
Projects on InnovationRCA Projects are now paginated
Reorganised search urls
Merge branch 'develop' into feature/editors-picks

Conflicts:
	django-verdant/verdantadmin/templates/verdantadmin/base.html
Merge branch 'develop' into feature/ldap-authentication
Rearranged settings files