fix.
fix.
#17 Admin user list added.
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	app/controllers/users_controller.rb
	app/views/users/index.html.erb
	app/views/users/show.html.erb