Include SITENAME in all templates
Merge branch 'master' of github.com:nkp/hackkings
Merge branch 'master' of github.com:nkp/hackkings

Conflicts:
	__init__.py