Merge branch 'qa' into development
cleaning up old build shite
fixing session manager user id
Merge branch 'development' into qa