SecurityController session + person_id
Merge origin/master