added bootstrap styles
Added bootstrap admin theme
fixed merge conflict