Merge pull request #76 from californiavol/master

merge from master
Merge pull request #83 from californiavol/master

Merge master into imac-work
Merge pull request #85 from californiavol/master

merge from master
Merge pull request #86 from californiavol/imac-work

Merge pull request #83 from californiavol/master
Merge pull request #87 from californiavol/webs-web1dev

Webs web1dev
Merge pull request #88 from californiavol/macbook-branch

Merge pull request #84 from californiavol/master
added admin layout and oocharts for google analytics
Merge pull request #89 from californiavol/imac-work

added admin layout and oocharts for google analytics
Merge pull request #90 from californiavol/master

merge from master