wangcongtao
c964cf780b
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# gradle.properties
# modules/mogo-module-common/src/main/res/drawable-mdpi/icon_heart_choose.png
# modules/mogo-module-common/src/main/res/drawable-mdpi/icon_heart_unchoose.png
# modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_choose.png
# modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_unchoose.png
# modules/mogo-module-common/src/main/res/values-mdpi/dimens.xml
# modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml
# modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java