added modal and help to forms
Merge branch 'master' into authenticate