Merge pull request #32 from wagnert/master

Refactoring session handling
Refactoring check for deployment descriptor
Merge branch 'techdivision'