BHL-86 WIP
Merge branch 'master' of https://github.com/YoustinaAtef/bhl_rails