git add   AndroidManifest.xml
git add  res/values/strings.xml
git add   src/kr/re/ec/zigeon/PhotoViewActivity.java
add
fixed conflicts
scaledimageview applied

wow! no dblclick kk
no hangul updated
commited.
conflict occured
hangul siro
Merge remote-tracking branch 'origin/KTHWorking' into develop

Conflicts:
	gen/kr/re/ec/zigeon/R.java
	res/values/strings.xml
	src/kr/re/ec/zigeon/ScaleImageView.java
conflict solved