.
Merge branch 'master' of https://github.com/Kimhyunsoo/TripShow.git

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/TripShow.apk
	bin/classes.dex
	bin/resources.ap_