removed admin from development
merging

Conflicts:
	app/views/devise/registrations/new.html.erb
testing development branch
testing123