started work
Merge branch 'dev'
very rough touchSessionCookie() function, unfinished