Bugfix
Merge branch 'master' of https://github.com/slintak/hive

Conflicts:
	hive/views.py