es meldet fehler
Merge branch 'master' of https://github.com/Artur123/SmartShopper.git

Conflicts:
	SmartShopper/res/layout/article_list_item.xml