half commit for db
more cookie + session
tiny changes
more session
Merge remote-tracking branch 'github/master'