Resolved Conflict in Session
Merge pull request #420 from saravanab/master

Resolved Conflict in Session