added html and bootstrap items
fixed merge conflicts
added bootstrap on buttons and data input forms
Merge branch 'master' into bootstrap