Completed RESTful actions on User resource
Merge branch 'master' into account-activation-password-reset

Conflicts:
	db/schema.rb - FIXED