ID rework

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-IdCleaning@7167 b45a01b8-16f6-495d-af2f-9b41ad6348cc