Enhancement #5
Merge remote-tracking branch 'origin/master'

Conflicts:
	Xue/res/layout/activity_learn.xml