working version
Merge branch 'BHL-125' of https://github.com/BibAlex/bhl_rails into BHL-125