Merge pull request #33 from perselab/master

Update retailer edit form - upload logo
improve retailer + fix rest cms service
fix upload settings