MapActivity comment added
setting activity made and Login data global access complete

oo hi
no hangul string.xml
Merge remote-tracking branch 'origin/Jihong' into develop

Conflicts:
	gen/kr/re/ec/zigeon/R.java
	res/values/strings.xml
Merge branch 'develop' of https://github.com/KimTaehee/Zigeon into develop

Conflicts:
	gen/kr/re/ec/zigeon/R.java
no hangle string.xml
MapActivity working

Can get Current Location.
no hangul
Merge remote-tracking branch 'origin/Jool' into develop

Conflicts:
	res/values/strings.xml
	src/kr/re/ec/zigeon/MapListActivity.java
no hangul applied
Merge branch 'develop' of https://github.com/KimTaehee/Zigeon into develop

Conflicts:
	gen/kr/re/ec/zigeon/R.java
	res/values/strings.xml
	src/kr/re/ec/zigeon/BubbleActivity.java
conflicts solved
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
no hangul updated
commited.
no hangul conflict solved
It Works!
no hangul string