Fixed toolbar bugs and image insertion.
swapped connection ip
uhh, github bug? (don't merge)
ok, all better now. merge away (I think/hope)
restoring lost changes: MERGE MASTER BEFORE COMMITING