BS3 form update
Merge pull request #750 from sexnothing/develop

BS3 form update