#2 Admin Profile created.
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	config/routes.rb
	db/schema.rb