Update bootstrap
Fix inline forms
Merge branch 'bootstrap3' into beta