Merge branch 'qa' into development
found one thing with setsession method
messing with log file
Merge branch 'development' into qa