Merge branch 'development' into qa
fixed sessionmannagement structuremap issue
Merge branch 'qa' into development