Merge remote-tracking branch 'origin/master'

Conflicts:
	Implementacion/protected/controllers/SiteController.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	Implementacion/protected/controllers/SiteController.php