Merge branch '80_add_bi_view_editor' of https://github.com/onesteinbv/reporting-engine into 80_add_bi_view_editor
Conflicts: bi_view_editor/README.rstpull/47/head
commit
a5f92fa407
Conflicts: bi_view_editor/README.rstpull/47/head