Parse timer.
Merge branch 'master' of github.com:liyinhgqw/parkinglot

add time.

Conflicts:
	bin/classes.dex
	bin/classes/com/example/ipark/MainActivity$2.class
	bin/classes/com/example/ipark/MainActivity$3.class
	bin/classes/com/example/ipark/MapActivity.class
	bin/iPark.apk
	src/com/example/ipark/MapActivity.java