? k
Merge remote-tracking branch 'origin/develop' into Jihong
new settingAcrivity
setting deleted, new preferenceActivity
preference xml
test... why not? SSANG
test OK but Preference.....not
test OKOKOK hahahahahahaha
preference data load test OK
data load test2
commit
Merge remote-tracking branch 'origin/Jihong' into develop
Merge branch 'develop' of https://github.com/KimTaehee/Zigeon into develop