JAWA Quests v0.2
Merge branch 'v0.7-Puccini' of https://github.com/radicalgraphics/escriba into v0.7-Puccini

Conflicts:
	qubalapp/views.py