Updates
Merge branch 'master' of github.com:qualitri/easybackoffice
Views update
Fix