sync
Merge branch 'master' of https://github.com/TimovNiedek/ResDev

Conflicts:
	HotMeals/TabTest/bin/R.txt
	HotMeals/TabTest/bin/TabTest.apk
	HotMeals/TabTest/bin/classes.dex
	HotMeals/TabTest/bin/classes/com/example/tabtest/R$id.class
	HotMeals/TabTest/bin/classes/com/tsjd/HotMeals/MainActivity.class
	HotMeals/TabTest/bin/resources.ap_
	HotMeals/TabTest/gen/com/example/tabtest/R.java