Waka 3
Merge https://github.com/delebrindel/qmr

Conflicts:
	qmr_app/views.py