Update Retailer Edit Form
Merge remote-tracking branch 'upstream/master'

Conflicts:
	theme-assets/assets-backoffice/assets-business-resources/src/main/resources/themes/default/css/qalingo-bo.css
Add warehouse to Retailer edit form
Merge pull request #33 from perselab/master

Update retailer edit form