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