Merge pull request #194 from innaDa/SessionKeepLiveWhileInEditMode

Session keep live while in edit mode
po request fixes
Merge remote-tracking branch 'upstream/master' into SessionKeepLiveWhileInEditMode