lockbox and improved identity; misc
Merge branch 'master' of github.com:openpeer/opjs