devise added
Resolved Conflicts:
	config/routes.rb