Apid se pasa al apid controllers
Merge branch 'master' of https://github.com/fernandohur/taxigol-server

Conflicts:
	config/routes.rb