renamed template tags to avoid confusion with django_hitcount
Merge branch 'origin/develop'