Admin Edit function

Lock/unlock feature not complete
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/devise/registrations/edit.html.erb
create admin functionality added

It creates an admin now
Merge branch 'master' of https://github.com/ewarth/shout