git add	modified:   src/kr/re/ec/zigeon/handler/SoapParser.java
git checkout -- src/kr/re/ec/zigeon/BubbleActivity.java
git checkout --  src/kr/re/ec/zigeon/GCMIntentService.java
Merge remote-tracking branch 'origin/KTHWorking' into newcho

Conflicts:
	src/kr/re/ec/zigeon/handler/SoapParser.java
test success
loading time change test
MemberDataset

merge?
PostingActivity hangul removed
DELETE test
e ge meo ya
git add res/values/strings.xml
git add src/kr/re/ec/zigeon/LandmarkActivity.java
Login + dataset save
merger doe ra
landmark capy
commit
commit
no hangul!!
Merge remote-tracking branch 'origin/Jool' into develop

Conflicts:
	res/values/strings.xml
landmark_write added
Merge remote-tracking branch 'origin/Jihong' into develop

Conflicts:
	src/kr/re/ec/zigeon/LandmarkActivity.java
	src/kr/re/ec/zigeon/PostingActivity.java
>>>>>>>>> HEAD removed

uh hew