Fixed row-fluid issues
Merge branch 'develop' into staging