another hopeful fix
I think this makes more sense
Merge branch 'getridofsessiononapp' into development
Merge branch 'development' into qa