Compile fix for DesktopApplication and changes to DB interface
testing branch change
Rolled back merge of testbranch