add bootstrap to gem
Merge branch 'develop'