Merge branch 'master' into stage
127.0.0.1 ecoedge.local
adding .htaccess file
Merge branch 'stage'