added bootstrap and flat-ui
Merge branch 'origin/master'