issue with gemfile
Merge branch 'fluid-ui'
bootstrap added
gemlock removed