Bug866824 - rebased on master

rebase of pull #53, with some fixes (code style, grunt CSS linting)