Some minor fixes on the server
Merge branch 'master' of https://github.com/tnatool/test.git

Conflicts:
	onebusaway-gtfs/bin/.gitignore