Remove temporary files.
Updated the gems to the latest.
measure-theme fixed
Merge remote-tracking branch 'origin'
Merge remote-tracking branch 'ta/master'

Conflicts:
	Gemfile
	Gemfile.lock
Merge remote-tracking branch 'origin'

Conflicts:
	app/views/pages/home.html.erb
	app/views/users/_user_fields_form.html.erb