Fix form issue
Merge branch 'master' of github.com:/bmbrands/theme_bootstrap