Merge pull request #32 from perselab/master

Update Retailer edit form
fix FO SEO
rename createdDate : dateCreate - updatedDate dateUpdate
fix DAO NPE + jxrs crosscontext
Update Retailer Edit form: upload logo
Merge remote-tracking branch 'upstream/master'