Merge pull request #205 from sortega/issues/41

Last preparations for replacing ProtoMicroPaymentChannel with MicroPaymentChannel