Re-updated overwitten scripts(?), added fix for annotation switcher

Conflicts:

	static/digipal/scripts/annotator-digipal.js
	static/digipal/scripts/annotator-page-script.js