Merge pull request #525 from AgileVentures/develop

Pushing Develop to Staging
Merge pull request #529 from AgileVentures/develop

Pushing Develop to Staging
Merge pull request #532 from AgileVentures/develop

Pushing BUG FIX: Memory quota exceeded to Staging
Merge pull request #536 from AgileVentures/develop

Pushing Develop to Staging
Merge pull request #540 from AgileVentures/develop

Pushing Develop to Staging
merging back 'staging' of https://github.com/AgileVentures/WebsiteOne into develop