merging
Merge branch 'master' of github.com:alesanchezr/slim-canis

Conflicts:
	src/com/4geeks/entities/Golfistas.php
	src/com/4geeks/model/Equipos.manager.php
Merge branch 'master' of github.com:alesanchezr/slim-canis
Updates to model (trying to connecto doctrine)