tidying up
Merge branch 'develop' of github.com:entando/entando-archetype-portal-bootstrap into develop