revise interface setting profile
Merge branch 'pr/4'

Conflicts:
	bin/TripAssistant.apk
	bin/classes.dex
	bin/classes/com/example/tripassistant/MainActivity.class
	bin/resources.ap_
	res/menu/ts_menu.xml
merge