couple of minor updates incl switch to production version
merging in GH master with Sams changes to local branch
Merge branch 'master' of https://github.com/Spaaza/spaaza.corp

Merging in GitHub Master branch