git checkout res/anim/bubblemove.xml
git checkout res/anim/bubblemove2.xml
git checkout res/anim/bubblemove3.xml
git checkout res/anim/bubblemove4.xml
git checkout res/layout/activity_posting.xml
git checkout res/values/strings.xml
Merge branch 'master' of https://github.com/wlghd1016/Zigeon

Conflicts:
	res/values/strings.xml

git checkout AndroidManifest.xml
git checkout README.md
git checkout gen/kr/re/ec/zigeon/R.java
git checkout res/layout/activity_photo_upload.xml
git checkout res/layout/activity_posting_list.xml
git checkout res/layout/activity_reply_list.xml
git checkout res/values/strings.xml
git checkout src/kr/re/ec/zigeon/BubbleActivity.java
git checkout src/kr/re/ec/zigeon/LandmarkActivity.java
git checkout src/kr/re/ec/zigeon/MapListActivity.java
git checkout src/kr/re/ec/zigeon/PhotoUploadActivity.java
git checkout src/kr/re/ec/zigeon/PostingActivity.java
git checkout src/kr/re/ec/zigeon/dataset/CommentDataset.java
git checkout src/kr/re/ec/zigeon/dataset/LandmarkDataset.java
git checkout src/kr/re/ec/zigeon/dataset/PostingDataset.java
git checkout src/kr/re/ec/zigeon/handler/SoapParser.java
git checkout src/kr/re/ec/zigeon/handler/UIHandler.java
git checkout src/kr/re/ec/zigeon/handler/UpdateService.java
git checkout src/kr/re/ec/zigeon/util/LogUtil.java