merged with upstream
Merge pull request #332 from tochman/develop

Fixes and Updates
Merge branch 'develop' of https://github.com/AgileVentures/WebsiteOne into develop
Merge branch 'develop' of https://github.com/sampritipanda/WebsiteOne into optimization