date field is read only.
resolve conflict.
resolve conflict.
Merge branch 'master' of github.com:joshsoftware/intranet
modified the user.js.coffee. change the manager id.
resolve the conflict.