Fixed a class name to filename issue with form validtion.
Merge branch 'develop'