Merge pull request #535 from gsn/test

Merged from Test.
294 on boarding
147 - styles
Merge pull request #542 from gsn/master

Merged from beta.