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

Conflicts:
	DesarrolloWawser/Wawser/app/views/usuario/admin-eliminar.blade.php
	DesarrolloWawser/Wawser/app/views/usuario/admin-horarios.blade.php
	DesarrolloWawser/Wawser/app/views/usuario/pagina-agregar.blade.php
asdasd