changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/users/_user_fields_form_email.html.erb
Finished by spinner for edit pages
Removed dependency to Dynamodb
Merge remote-tracking branch 'rt/master'