replaced expressions in templates with view composers
Merge branch 'user_fields' into dev