added api for bus locations
add bus routes after enter
Merge branch 'master' of https://github.com/leonpegg/springhack

Conflicts:
	public/javascripts/app.js
	views/index.jade