FIX: proper jinja field list; ADD: phone, field
Merge branch 'master' into production