added jquery.form.js to repo
fixed merge conflicts