serverside routes.html report
Merge pull request #43 from avilaton/routes-report

Routes report. Closes #42
add staging config
add active col to trip model
Merge https://github.com/avilaton/gtfseditor
handle boolean in as_dict
cleanup some config
draft first integration
add agency controller
add calendars controller
add calendar_dates controller
Merge pull request #48 from avilaton/agency-controller

Agency controller, Closes #44
Merge branch 'master' into calendar-controller

Conflicts:
	app/api/__init__.py
Merge branch 'calendar-controller'
Merge pull request #50 from avilaton/flask-services

Replicate services from old bottle implementation in flask app. @marianodo Here I add some of the services you probably need for the stops and shapes controllers. Please check and let me know if you need anything else.
Merge branch 'master' into calendar_date-controller

Conflicts:
	app/api/__init__.py
Merge branch 'calendar_date-controller'
Merge branch 'master' into trip-ctrl-fix

Conflicts:
	data-dev.sqlite
Merge branch 'master' into trip-ctrl-fix

Conflicts:
	app/api/__init__.py