글 수정 추가
Merge branch 'master' of https://github.com/uoscsAndroid/CouponKING.git

Conflicts:
	AndroidManifest.xml