Improved session timer
UserProfile
Merge origin/master