changed options template
Merge branch 'dev'
added sysUser field to User