session controller specs complete
Merge branch 'master' into user