measure-theme fixed
Merge remote-tracking branch 'origin'
Merge remote-tracking branch 'origin'

Conflicts:
	app/views/pages/home.html.erb
	app/views/users/_user_fields_form.html.erb
Measure+nilavu 3-1-2013
Fake dynamo fixed
Updated documentation, fix the script to cleanup ~temp files lefovers from gedit.
Merge remote-tracking branch 'ta/master'
Deleted the tmp files