external auth without test
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/users/users.authentication.server.controller.js