Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/res/layout/authentic_leading_course.xml
	app/src/main/res/layout/startup_plus_course.xml