Manual merge, so possibly a few more bits to come - such as:
TODO:
Rename quicktags to toolbars (coming very soon)
Find/make missing icons
Check no javascript behaviour
Create database upgrade script
Test test test!