issue_id: HOOK-2138
Merge branch '20121212-json-provisioning' of github.com:openpeer/op into 20121212-json-provisioning

Conflicts:
	.gitignore