User (update) GOlfista (create) - src/model
Merge branch 'master' of github.com:alesanchezr/slim-canis
Merge branch 'master' of github.com:alesanchezr/slim-canis

Conflicts:
	src/model/User.php
local, entity manager on the way
Merge branch 'master' of github.com:alesanchezr/slim-canis
Usuarios, Equipos routes
Merge branch 'master' of github.com:alesanchezr/slim-canis

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