Improved user state to always check for valid session on load
Merge remote-tracking branch 'origin/master'