Added user show, deleted user index
Merge branch 'dev' into config

Conflicts:
	app/assets/stylesheets/layout/_grid.scss
	app/assets/stylesheets/objects/_form.scss
	app/controllers/users_controller.rb
	app/views/shared/_nav.html.erb
	app/views/users/index.html.erb