Improved queries to the database; some improvement in annotator
Merge branch 'master' of github.com:kcl-ddh/digipal

Conflicts:
	views/annotation.py