Merge bootstrap3 branch.
Merge branch 'master' of github.com:bluelemons/rails_backend