Some changes updated by edit pages
Merge remote-tracking branch 'rt/master'
cloud books design finished
updates to gems
Merge remote-tracking branch 'rt/master'
Merge remote-tracking branch 'ta/master'

Conflicts:
	app/views/users/_organization_fields_form.html.erb
	app/views/users/show.html.erb
back to last update
Merge remote-tracking branch 'origin'
back to upd
Brocken signup via fb yet to be tested