yotam: added some data from model to person template
Merge remote-tracking branch 'origin/master'
added tags to admin