kjn
Merge branch 'master' of https://github.com/Wawser/Wawser-V1.0

Conflicts:
	DesarrolloWawser/Wawser/app/controllers/PaginaController.php
	DesarrolloWawser/Wawser/app/routes.php
	DesarrolloWawser/Wawser/app/views/horarios.blade.php
knj