Successful Liaison login
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.idea/workspace.xml
	spec/integration/admin_functionality_spec.rb
Fixed error with roles already being seeded
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	spec/integration/admin_functionality_spec.rb
Modified Admin User Factory to search for the seeded user role based on the name "Admin"