working customised
Merge branch 'develop' of https://github.com/srugano/ureport-bdi into develop