Added some todo items to DatabaseFormatter
Improved DatabaseFormatter, now more robust
Merge branch 'master' into DatabaseFormatter
DatabaseFormatter is done for now, very robust. Moved out SortDirection to utils package, added an xml beautifier