fuuu
Merge branch 'master' of https://github.com/Artur123/SmartShopper

Conflicts:
	SmartShopper/gen/at/jku/smartshopper/client/R.java
	SmartShopper/src/at/jku/smartshopper/client/Basket_Overview.java