changed deprecated $().live into $().on
Merge remote-tracking branch 'origin/master'

Conflicts:
	resources/public/core.js
	resources/public/index.html
	src/Taxi/core.clj