Change 'reusable_form' references to 'template'
Update distro and JavaDocs.
Merge branch 'develop'