Spinner wasn't working before due to multipart=true (file uploads)
final frontpage images
Merge remote-tracking branch 'rt/master'

Conflicts:
	app/views/users/_add_button.html.erb
	app/views/users/_user_fields_form.html.erb
	app/views/users/edit.html.erb
Tweak front page
Merge remote-tracking branch 'rt/master'

Conflicts:
	app/views/users/_add_button.html.erb
	app/views/users/_user_fields_form_email.html.erb
	app/views/users/edit.html.erb
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/users/_user_fields_form_email.html.erb