added docs to position
Merge branch 'master' of github.com:fernandohur/taxigol-server
emptied default rails rdoc
Merge branch 'ceduquey'
Merge branch 'master' of https://github.com/fernandohur/taxigol-server
Added api versioning, starting with v1
1. Modified routes to add /api/v1/* routes
2. Added {api|driver|positions|services}_controller
3. Added api_key but haven't implemented security yet
fixed small issue with invalid id when showing
Merge branch 'ceduquey'

Conflicts:
	db/schema.rb
Algun error con el merge
heroku conf env
error en el controlador para editar y eliminar
added taxis controller in api/v1
Merge branch 'ceduquey'

Conflicts:
	app/controllers/drivers_controller.rb
added auth to service
Merge branch 'master' of github.com:fernandohur/taxigol-server
improved message sender
migrated and modified service after_ callback
fixed update-no-response issue
added environment variables for URBAN_AIRSHIP
small refactoring for to_json