Added class id to the forms.
Upgraded to 1.6.2.
Merge branch 'upgrade' into develop