merging master
merged master
Merge pull request #2 from lsugino/update_jquery_validate

Update jquery validate