more changes
Merge branch 'master' of github.com:LocBoxLabs/analytics