- change "openpeer/calculated/instanceID" to "openpeer/calculated/instance-id" to be consistent with device-id version
https://github.com/openpeer/opios/issues/319
Merge branch '20140401-dev-stable' into feature-20140521-push-messaging

Conflicts:
	libs/op