git checkout -- res/values/strings.xml
git checkout -- src/kr/re/ec/zigeon/BubbleActivity.java
git checkout -- src/kr/re/ec/zigeon/MapActivity.java
git checkout -- src/kr/re/ec/zigeon/handler/UIHandler.java
git checkout -- src/kr/re/ec/zigeon/handler/UpdateService.java
Merge remote-tracking branch 'origin/develop' into Jool

Conflicts:
	res/values/strings.xml
	src/kr/re/ec/zigeon/BubbleActivity.java
	src/kr/re/ec/zigeon/handler/UIHandler.java
conflicts solved
current location button added
no hangul mapactivity
no hangul mapactivity
Merge remote-tracking branch 'origin/Jool' into develop
Merge branch 'develop' of https://github.com/KimTaehee/Zigeon into develop