OR-870 Resolve bower dependencies conflicts
Merge pull request #601 in OR/rse from ~RPIGNOLET/rse:OR-870 to master

* commit 'c7caf114c57aa95e6540d75751def42c0cd0b8f0':
  OR-870 Resolve bower dependencies conflicts