change way to invalidate session
Merge branch 'dev'