added jquery and form validation
Merge origin/master