测试一下是否有更新！
moreActivity
Merge branch 'master' of https://github.com/Heven/BusAppRepository.git
改了下名字
chu le mei gong
Merge remote-tracking branch 'origin/master'
test
thanks for fw
Merge commit '282ead6c0b46b5d750e7dab2f94fb9126b806ada' into
1d7e6dbd526912fb068e3d06e33badcccc0f5966

Conflicts:
	BusApp/src/app/bus/database/DatabaseHelper.java
modified the DatabaseHelper class .  By Heven.