Merge remote-tracking branch 'michaelstorm/ldap_signin'

Conflicts:
	Gemfile
	Gemfile.lock