Test with Ldap and refactor role tests.
Merge branch 'ldap_refactor' of https://github.com/gbrego/SRA into ldap_refactor

Conflicts:
	app/models/user.rb