Fix broken analytics and isOwner functions.
Merge branch 'master' of github.com:manshar/manshar