MinorFix
Merge branch 'master' of https://github.com/pyjamas-djangodash/lingvista

Conflicts:
	lingvista/api/urls.py