Merge branch 'stage'
adding icons
Merge branch 'icon' into stage
updating header
updating icons iwth white backgrounds
disabling jumplist to fix home page bug
Merge branch 'stage'
127.0.0.1 ecoedge.local
merging master