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

# Conflicts:
#	app/src/main/java/kr/co/zumo/app/lifeplus/view/custom/contents/CustomListicleImageViewHolder.java

app/src/main/java/kr/co/zumo/app/lifeplus/view/custom/contents/CustomListicleImageViewHolder.java

@@ -42,7 +42,6 @@ public class CustomListicleImageViewHolder extends RecyclerView.ViewHolder {
     Glide.with(imageViewBackground)
       .asBitmap().load(bean.getImageUrl()).into(imageViewBackground);
 
-
     // TODO: copyright 처리
     if (null != bean.getCopyRight()) {
       textViewCopyRight.setText(bean.getCopyRight());

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/contents/ContentsListicleHolder.java

@@ -43,7 +43,7 @@ public class ContentsListicleHolder extends ContentsHolder<ContentsDetailBean> {
   protected void bindInternal() {
     List<ContentsDetailImageBean> contentsDetailImageBeans = bean.getItemImageList();
 
-    customListicleImageView.init(itemView.getContext(), index, bean.getTitle(), bean.getSubTitle(), contentsDetailImageBeans, event -> {});
+    customListicleImageView.init(itemView.getContext(), index, bean.getTwoLineTitle(), bean.getSubTitle(), contentsDetailImageBeans, event -> {});
 
     if (null != layoutContainer) {
       layoutContainer.removeAllViews();

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/main/MainFragment.java

@@ -182,14 +182,14 @@ public class MainFragment extends FragmentBase<MainPresenter> implements IMainVi
   }
 
   @Override
-  public void onStop() {
-    super.onStop();
+  public void onPause() {
+    super.onPause();
     AnimatorManager.getInstance().pause();
   }
 
   @Override
-  public void onStart() {
-    super.onStart();
+  public void onResume() {
+    super.onResume();
     AnimatorManager.getInstance().resume();
   }