Updated test script and digipal annotator tests
Merge branch 'master' of github.com:kcl-ddh/digipal

Conflicts:
	static/digipal/scripts/tests/config.js