Added javascript validation.
Merge branch 'develop'