Merge branch 'developer'

测试
--- a/app/src/main/res/layout/fragment_me.xml
+++ b/app/src/main/res/layout/fragment_me.xml
@ -72,7 +72,7 @@
                android:paddingRight="12dp"
                android:text="设置"
                android:textSize="@dimen/text_size_18" />
            

        </LinearLayout>

    </android.support.v7.widget.CardView>
Author	SHA1	Message	Date
zhanghui	7a8d5b041a	Merge branch 'developer'	8 years ago
zhanghui	8d319bf6f7	测试	8 years ago