cambios 29/12/2014
Merge origin/master

Conflicts:
	protected/controllers/AgendaController.php