Merge branch 'master' into develop
added row-fluid and alt in images
Merge branch 'staging'