Refactored list method
Instance variables refactoring
Added Helper methods and  removed =>
Removed commented out code
changed form methods from POST to GET
split the if check in show_selection into 2 if checks
Added braces in elsif check
Merge branch 'e1465' into rails4

Conflicts:
	Gemfile.lock
	app/views/users/index.html.erb
	config/routes.rb
	test/functional/users_controller_test.rb