Agenda da secretaria pronta (falta por o duracao a funcionar)
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	app/assets/stylesheets/appointments.css.scss
	app/models/appointment.rb
	app/views/appointments/index.html.erb
	public/assets/demo.js
	public/assets/jquery-ui-1.8rc3.custom.min.js
	public/assets/jquery.weekcalendar.js