- Added line/shape draw and object edit to the map editor menu bar
- Reload the map editor menu bar when key binds are changed
Focus the text control by default when changing a keybind
Add new toolbar icons

Icons for line draw, shape draw and object edit. Not 100% happy with them but will do for now.
Increase default preferences dialog size

Was a bit small for using some pages comfortably like input etc. Also more commenting and stuff.
Merge branch 'master' of https://github.com/sirjuddington/SLADE.git
Fix some problems with architecture merging

Should hopefully fix everything in #109. Also more commenting stuff
Changed handling of MapObject create/delete in undo system

Experimenting with a different way of handling map object creation and deletion in the undo system. This way is a bit more memory and cpu intensive, but should be much less error-prone than the previous method. Very much unoptimised currently (I can think of some simple ways to reduce memory usage etc), but I want to see if it actually works better first
Only keep relevant lists in MapObjectCreateDeleteUS
Don't put keybind shortcut keys on SAction menu items

Was blocking keypresses unnecessarily, eg. pressing e on the map editor console wouldn't add the character (would try to begin object edit instead). Doesn't seem to be any way to show the accelerator key on the menu item but not actually process it
Make sure map editor property change undo steps do not overlap
Fix undo sometimes leaving holes in geometry
Object indices need to be updated when restored
Remove any resulting detached vertices after sector merge
Merge branch 'master' of https://github.com/sirjuddington/SLADE into Music