Merge branch 'staging'
Updated index.html to correct row-fluid classes