#326 ensures non scholars don't see collections tab on profile page
Merge branch 'development' into rb/326-collections-tab-profile-page

Conflicts:
	spec/features/custom_collections_actions_spec.rb
Merge pull request #371 from afred/rb/326-collections-tab-profile-page

#326 ensures non scholars don't see collections tab on profile page