Clientsession update
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/stylesheets/application.css
	app/controllers/clientsessions_controller.rb
	app/models/clientsession_rating.rb
	app/views/Clientsessions/edit.html.erb
	app/views/clients/show.html.erb
	config/routes.rb