added jsdoc headers
Merge branch 'master' into ui