adjusted version in bower.json
Merge branch 'ray'