xoa de update lai
Update What2Eat
Merge branch 'master' of https://github.com/maihongnhat/WTE

Conflicts:
	What2Eat/res/layout/activity_main.xml
	What2Eat/res/layout/activity_splash.xml
	What2Eat/res/layout/dialog.xml
	What2Eat/res/layout/randomdialog.xml
	What2Eat/res/values/strings.xml
	What2Eat/src/com/fas/what2eat/MainActivity.java