tags and zappoints links is done
Merge branch 'master' of https://github.com/wrvangeest/Context

Conflicts:
	Prototype6/javascript/tagdata.js