Merge branch 'release/v1.0'
text size
Merge branch 'hotfix/v1.1' into develop

Conflicts:
	res/layout/activity_main.xml