Merging js validation into master