font changed
Merge remote-tracking branch 'origin/category-names'

Conflicts:
	res/layout-small/activity_feedback.xml
	res/layout/activity_feedback.xml