Merge branch 'master' into gh-pages
.row-fluid bug fix
Merge branch 'gh-pages'