Devise Authentication
Devise Authentication + Audit
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	app/models/external_master_database.rb