checkbox
checkbox
checkbox
Merge origin/master

Conflicts:
	protected/models/Agenda.php
	protected/models/Agenda2.php
	protected/views/agenda/view.php
	protected/views/porcentajes/_form.php
	protected/views/porcentajes/admin.php
	protected/views/porcentajes/update.php