Merge branch 'master' into agenda

Conflicts:
	app/models/appointment.rb
	spec/models/appointment_spec.rb
fix
css
timeline