bootstrap mods, elaboration refactorings, img remove button
Merge remote-tracking branch 'origin/master'

Conflicts:
	elaboration/templates/elaboration/elaboration_tag.html