fare form
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	app/driverlist/driver.list.js
	app/farelist/fare.list.js