Reformat database files
Redo database managment to be more flexible.
Adjust comments
Remove merge stuff
Merge pull request #1133 from concrete5/database_manager

Database manager
updating version number
Improve test coverage of DatabaseSaver and DatabaseLoader
Merge pull request #1138 from KorvinSzanto/master

Handle moving a block within a global area.
Add shutdown event