Without Bootstrap rails/ Only Bootstrap Native
Merge remote-tracking branch 'origin/master'