tags and text edits
Merge branch 'shwetha'

Conflicts:
	public/pub-spelman/img.json
spelman tag edit