Refined Main Activity
Merge branch 'master' of https://github.com/chenghan91/LepakOrderer-Vitesse

Conflicts:
	app/src/main/res/values/strings.xml