Created frmConsole, added OLV and Appdirs to lib folder, updated addpoints
Fixed Merge conflicts