1
finish the collection
Merge branch 'master' of https://github.com/Heven/BusAppRepository.git

Conflicts:
	BusApp/gen/app/bus/activity/R.java
	BusApp/res/layout/collectionlistitem.xml
	BusApp/src/app/bus/activity/BusStationActivity.java
test