Merge upstream/branch-v2 into branch-v2
Add temporary psych version as a gem
Strong parameters for institution
New syntax for query in manage controller
Update institution model syntax to rails4
Prevent error when serializing singleton objects
Add missing menu in space_users
Update ldap syntax
Update manage_controller spec syntax
Correct feature specs
Readd user factory details
Update some spec syntax
Some corrections to model specs
Corrections in space model spec
Adapt ldap tests to look more like real life data
Merge branch 'rnp-branch-v2-rails4' into rnp-branch-v2

Conflicts:
	spec/controllers/shibboleth_controller_spec.rb