resolve conflicts
Merge branch 'master' of https://github.com/BibAlex/bhl_rails