test11
Merge branch 'develop' of https://github.com/yuiyeong/test1 into develop

Conflicts:
	src/kr/mint/test1/BaseActivity.java