Merge branch 'master' of https://git.kuyuntech.com/developer/FoodCooking_LandScape

 Conflicts:

	app/src/main/assets/skins/night.skin