add bootstrap gem, modify production and development database gem file
Merge remote-tracking branch 'upstream/master'