Merge remote-tracking branch 'origin/master'

Conflicts:
	Childedu/src/main/java/com/hyrt/childedu/BaseActivity.java