Fixes #370. Corrects issue with the setup process.
Merge pull request #371 from pencilblue/issue/PB370

Fixes #370. Corrects issue with the setup process.
fixed issue where custom object could not be deleted
Fixes #374. Fix for memory leak in session handler
Merge pull request #375 from pencilblue/issue/PB374

Fixes #374. Fix for memory leak in session handler
Merge remote-tracking branch 'upstream/master'