merge
commit
Merge branch 'master' into hh

Conflicts:
	bin/classes/kr/ac/mju/capstone/tripshow/MainActivity.class
	src/kr/ac/mju/capstone/tripshow/MainActivity.java