CVJ-93
Merge branch 'master' of https://github.com/XVTSolutions/ckanext-vdojstats

Conflicts:
	ckanext/vdojstats/helpers.py
	ckanext/vdojstats/plugin.py
	ckanext/vdojstats/templates/vdojstats-base.html