as
Merge branch 'master' of https://github.com/voyager1234/lets_eat_app.git

Conflicts:
	Let'sEat/gen/com/donga/lets_eat/R.java