Gem bootstrap-sass without conflicts.This branch was merged from master ...