fixed except not valid user edit
Merge branch 'master' of github.com:nedimm/sample_app

Conflicts:
	Gemfile.lock
	spec/models/user_spec.rb
	spec/requests/static_pages_spec.rb