contact manager updates
Merge branch 'release/12.0' of ssh://git.freepbx.org/FREEPBX/userman into release/12.0