Image insertion mostly done-ish
mergedfrommaster
Merged again from master
Merge branch 'benV2' of https://github.com/benzenittini/azosc into ahmad

Conflicts:
	client/index.html