fix
Merge branch 'master' of https://github.com/fhacktory/TagIt

Conflicts:
	context.js