Merge with the stable branch. Hot Desking update the code so the unique id and pin number are updated.

git-svn-id: http://fusionpbx.googlecode.com/svn/trunk@4625 e2954ef0-caed-11de-bd98-e341d93cc3cc