update
Merge branch 'master' of github.com:iceleaf916/TravelTimes

Conflicts:
	AndroidManifest.xml
	res/layout/activity_main.xml
	src/com/deepin/traveltimes/MainActivity.java