Changes in Usuarios.manager and Socio.manage
Merge branch 'master' of github.com:alesanchezr/slim-canis

Conflicts:
	src/com/4geeks/model/Usuarios.manager.php