fix arabic layout
resolve conflicts
Merge branch 'arabic' of https://github.com/BibAlex/bhl_rails into arabic
resolve conflict