Merge branch 'master' of https://github.com/getActivity/AndroidProject

 Conflicts:

	app/build.gradle

	base/src/main/java/com/hjq/base/BaseDialog.java