Aula Calendario (list, update date)
Merge branch 'master' of https://github.com/lucasalves/cj-smart

Conflicts:
	public/app/View/Aula/scaffold.form.ctp
	public/app/View/Elements/calendario.ctp