Merge branch 'develop' of https://github.com/swict/LifeplusAndroid into develop

app/src/main/AndroidManifest.xml

@@ -284,7 +284,6 @@
     <activity android:name=".lifeplus.zumo.activity.TermsAndAgreeActivity"
         android:screenOrientation="portrait"
         android:theme="@style/AppThemeZumo"/>
-
     <!-- ZUMO -->
 
     <!-- Naver Setting -->
@@ -294,6 +293,12 @@
         android:theme="@style/AppThemeZumo"/>
     <!-- Naver Setting -->
 
+    <!-- Kakao theme Setting -->
+    <activity android:name="com.kakao.auth.authorization.authcode.KakaoWebViewActivity"
+        android:screenOrientation="portrait"
+        android:theme="@style/AppThemeZumo"/>
+    <!-- Kakao theme Setting -->
+
     <!-- Install referrer Setting -->
     <receiver
         android:name="kr.co.zumo.app.lifeplus.InstallReferrerReceiver"

app/src/main/java/kr/co/zumo/app/lifeplus/model/Model.java

@@ -166,10 +166,6 @@ public abstract class Model extends ViewModel implements ILifeCycle, IHelperProv
    */
   public boolean isUpdateUser() {
     LifeplusPreferences preferences = getPreferences();
-
-    //TODO: 기존 주모 업데이트 유저는 해당 유저넘버 유지하여 자동 로그인
-//    SuperModel.getInstance().setUserNo(preferences.getZumoUserNo());
-
     return StringUtil.isFull(preferences.getZumoUserNo()) && preferences.isZumoUserUpdateCompleted() == false;
   }