syncing with good data
test
Merge branch 'master' of https://github.com/gotechsn/TrafficJammeu

Conflicts:
	src/sn/gotech/trafficjammeu/MapActivity.java