Merge branch 'master' of /Users/Shared/development/projects_local/magic with conflicts.
Benennung der Bilder
refreshData im addNewPrices