螢幕進度顯示類別.
Merge branch '19-progress-class' into develop

Conflicts:
	res/layout/activity_main.xml