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

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

@@ -87,7 +87,7 @@ public class SignUpModel extends BaseModel {
 
                 if (resultBean.isJoinPossYn()) {
                     SignUpModelHelper.getInstance().setTempMemberDataBean(userInfoDeliveryBean);
-                    onResult(new Event.Builder(Event.SUCCESS).integer(Event.EMAIL_SOCIAL_VALID_CHECK).build());
+                    onResult(new Event.Builder(Event.SUCCESS).integer(Event.EMAIL_SOCIAL_VALID_CHECK).bool(resultBean.isJoinPossYn()).build());
                 } else {
                     if (autoLogin) {
                         MemberLoginRequestBean memberLoginRequestBean = new MemberLoginRequestBean();

app/src/main/res/values/strings.xml

@@ -275,7 +275,7 @@
   <string name="setting_menu2_register">스페셜/추천인 코드 등록</string>
   <string name="setting_menu3">푸시 알림/위치 설정</string>
   <string name="setting_menu3_setting1">콘텐츠/서비스 정보 수신</string>
-  <string name="setting_menu3_setting2">이벤트 정보 수신</string>
+  <string name="setting_menu3_setting2">이벤트 혜택 / 서비스 정보 수신</string>
   <string name="setting_menu3_setting3">위치기반 서비스 이용</string>
   <string name="setting_menu3_setting3_1">날씨제공 : 케이웨더</string>
   <string name="setting_menu3_push_enable">"알림이 오지 않을 경우 &lt;font color='#666666'>&lt;u>여기&lt;/u>&lt;/font>를 눌러 알림수신을 허용해주세요."</string>