#104 javadoc for handlebars integration
Merge remote-tracking branch 'origin/master'