Changed persons from Map to ArrayList
Merge remote-tracking branch 'origin/Smara'