shower jsdoc
Merge branch 'dev' of github.com:shower/core into dev