Form js validation, error message, bufix
Merge branch 'master' of github.com:bostak/framework into Sam
Merge branch 'Sam'