Merge branch 'develop'
Bug fixing retrieve filters in entities list page
Bug fixing and improvements
Bug fixing: adding new entity field view
Bug fixing: adding new entity field view for boolean
Bug fixing missing repository var in a view
Bug fixing and other
Resolving conflicts
Merge branch 'master' into develop