Dario, checbox, reportes
Merge origin/master

Conflicts:
	protected/models/Agenda2.php