Merge remote-tracking branch 'origin/master'

Conflicts:
	CheapBasket/bin/classes/com/example/cheapbasket/MainActivity.class
	CheapBasket/bin/classes/com/example/cheapbasket/Product.class
	CheapBasket/bin/classes/com/example/cheapbasket/R$id.class
	CheapBasket/bin/classes/com/example/cheapbasket/R$layout.class
	CheapBasket/bin/classes/com/example/cheapbasket/R$menu.class
	CheapBasket/bin/classes/com/example/cheapbasket/R$string.class
	CheapBasket/bin/classes/com/example/cheapbasket/R$style.class
	CheapBasket/bin/classes/com/example/cheapbasket/SearchProduct.class
	CheapBasket/bin/classes/com/example/cheapbasket/SwitchView$1.class
	CheapBasket/bin/classes/com/example/cheapbasket/SwitchView.class
	CheapBasket/gen/com/example/cheapbasket/R.java
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit bd8d7aaa5de263b80601a68c64325b3a35ce57ae.