Continuando o MVC da agenda
Merge branch 'agenda_mvc'

Conflicts:
	app/admin/models/admin.inc