updated maps
displaying distance and time
rounding off distance and time
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/Maps.jsp
Merge branch 'master' of https://github.com/IDeaSCo/COS

Conflicts:
	src/main/webapp/Maps.jsp