add bootstrap and edit Gemfile,custom.css.scss
Merge branch 'master' into jqeury_ui_bootstrap