Merge branch 'master' into stage
updaiting homepage and about content
Merge branch 'stage'
127.0.0.1 ecoedge.local