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

app/src/main/res/drawable/scroll_bar_thumb.xml

@@ -4,5 +4,5 @@
   android:startColor="@color/C999999"
   android:endColor="@color/C999999"
   android:angle="0"/>
-<corners android:radius="3dp"/>
+<corners android:radius="1dp"/>
   </shape>

app/src/main/res/layout/main_first_category_grid_view.xml

@@ -32,9 +32,11 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginStart="12dp"
-      android:layout_marginEnd="8dp"
       android:layout_marginBottom="12dp"
+      android:ellipsize="end"
       android:lineSpacingExtra="4dp"
+      android:maxLines="2"
+      android:paddingEnd="20dp"
       android:textColor="@color/CFFFFFF"
       android:textSize="14sp"
       app:layout_constraintBottom_toBottomOf="parent"
@@ -42,6 +44,6 @@
       app:layout_constraintHorizontal_bias="0"
       app:layout_constraintStart_toStartOf="parent"
       tools:text="뜻밖의 오후 반차
-어디가지? 코스 6"/>
+어디가지? 코스 6OOOOOOOOOOOOOOOOOOOOOdddddddddddddddddddddd"/>
   </android.support.constraint.ConstraintLayout>
 </android.support.constraint.ConstraintLayout>