- mismatch in element names for peer secret
- fixed up some issues with location that were prevent peer connections
Merge branch '20121212-json-provisioning' of github.com:openpeer/op into 20121212-json-provisioning

* '20121212-json-provisioning' of github.com:openpeer/op:
  - fix for TestMediaEngine linking problem on BB
  - media related changes for BB - MediaEngine and WebRTC