Merge branch 'master' of github.com:lncnb91/reverse_auction

Conflicts:
	app/controllers/admin/users_controller.rb
	app/helpers/header_menu_helper.rb
	app/models/user.rb
	app/views/admin/users/_form.html.erb
	app/views/admin/users/_search_form.html.erb
	app/views/admin/users/index.html.erb
	config/database.ymls/development.yml
	config/database.ymls/production.yml
	db/migrate/20140904074204_create_users.rb
	db/schema.rb
	db/seeds.rb