Add user edit/add/delete feature
Merge remote-tracking branch 'vmw-tmpst/master' into edit_user

Conflicts:
	db/schema.rb
Merge pull request #13 from whywhy36/edit_user_feature

Edit user feature