Quest following
Merge branch 'quests' of github.com:danux/RPG-Engine-2 into quests

Conflicts:
	quests/mixins.py
	quests/urls.py
	quests/views.py