no message
Merge branch 'master' of https://github.com/chenghan91/LepakOrderer-Vitesse

Conflicts:
	app/src/main/java/com/example/chenghan/lepakorderer_vitesse/MenuActivity.java