Calendario pronto , tem apenas um bug de usabilidade
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	app/controllers/appointments_controller.rb
	app/views/appointments/index.html.erb