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

Conflicts:
	SmartShopper/bin/resources.ap_
Merge branch 'master' of https://github.com/Artur123/SmartShopper.git
test_overview entfernt