fixed Session class bug
Merge branch 'feature/20140614' into develop