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
lista
parseURL
parseURL
error
Merge branch 'master' of https://github.com/agustincl/zgz2014m

Conflicts:
	README.md
	crudusuarios/modules/Application/src/Application/controllers/error.php
	crudusuarios/modules/Core/src/Router/models/parseUrl.php
Merge branch 'master' of https://github.com/patriR/zgz2014m

Conflicts:
	crudusuarios/.project
	crudusuarios/.settings/org.eclipse.php.debug.core.Debug_Process_Preferences.prefs
	crudusuarios/modules/Application/src/Application/controllers/error.php
	crudusuarios/modules/Application/src/Application/controllers/users.php
	crudusuarios/modules/Application/src/Application/layouts/dashboard.phtml
	crudusuarios/public/index.html
	crudusuarios/public/index.php
Añado docs