Comentario
Merge branch 'master' of https://github.com/agustincl/zgz2014m

Conflicts:
	README.md

	modified:   crudusuarios/modules/Core/src/Router/models/parseUrl.php
	crudusuarios/modules/Application/src/Application/controllers/lista.php