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
photo view add
Merge remote-tracking branch 'origin/newcho' into develop

Conflicts:
	AndroidManifest.xml
	gen/kr/re/ec/zigeon/R.java
	res/values/strings.xml
	src/kr/re/ec/zigeon/LandmarkActivity.java
	src/kr/re/ec/zigeon/handler/SoapParser.java