Opciones Paginas
Merge branch 'master' of https://github.com/Wawser/Wawser1.1

Conflicts:
	app/controllers/AdministradorController.php
	app/controllers/HomeController.php