Add Shahar Or to authors.
Small code style change.
Merge branch 'master' into grunt-sphinx
Semantic changes in Grunt Sphinx integration.