Change bus stops to singleton
Add code to cache collected data locally
Merge branch 'master' of https://github.com/kaiyao/isbtracker2

Conflicts:
	src/com/nus/cs4222/isbtracker/BusStops.java
	src/com/nus/cs4222/isbtracker/WaitingTime.java