Custom Listview
Merge branch 'master' of https://github.com/Artur123/SmartShopper.git

Conflicts:
	SmartShopper/bin/SmartShopper.apk
	SmartShopper/bin/classes.dex
	SmartShopper/bin/classes/at/jku/smartshopper/client/Basket_Overview.class
	SmartShopper/bin/classes/at/jku/smartshopper/client/R$id.class
	SmartShopper/bin/classes/at/jku/smartshopper/client/R$layout.class
	SmartShopper/bin/classes/at/jku/smartshopper/client/R$menu.class
	SmartShopper/bin/classes/at/jku/smartshopper/client/R$string.class
	SmartShopper/bin/classes/at/jku/smartshopper/client/R$style.class
	SmartShopper/bin/resources.ap_
	SmartShopper/gen/at/jku/smartshopper/client/R.java
	SmartShopper/res/layout/activity_basket_overview.xml
	SmartShopper/src/at/jku/smartshopper/client/Basket_Overview.java