fixed js issues
Merge branch 'master' of github.com:stephanieguo/friendswap
minor bug fix in form validation