transfer to bootflat css
more edits to html
website changes
Merge branch 'dev1'