fix-sessions-merge-conflict
Merge branch 'fix-sessions-editor' into staging

Fixed post-types/session.php conflict