use active record for session_store again
Merge branch 'master' into release