Merge pull request #165 from marv-engine/tx21

Tx21 (Sell one currency for another MSC-based currency) description updated. Removed conflicts w/ help from @CurtisLacy.
Merge pull request #238 from marv-engine/tx21

minor - fixed Close Crowdsale table formatting
first draft of managed smart property
Updated examples and added transaction byte sizes
Accurately reflect MSC-only for stage 1 metadex
Wording changes in response to comments from dexx
Further wordsmithing for dexx
Wordsmithing for Marv
Updates based on PR feedback

clarified restrictions on grants/revokes
removed wallet references
made memo optional
added TBD for feature release block
Merge pull request #243 from wanderingbort/manual_issuances

Manually issued Smart Property Tokens
changes to represent validity of p2sh addresses as master protocol addresses
Added language on handling ClassBs where the sender is a p2sh address.  OP_CHECKMULTISIG only supports public keys.  No public key hashes or script hashes are allowed.  As such the canonical Senders Address is the 1 of N necessary to redeem the output is not available to p2sh addresses.  As it was never explicitly required in the spec that this pubkey match the senders address, it is now explicitly mentioned that it can be any address the sender designates to be the output redeemer
Merge branch 'master' of https://github.com/mastercoin-MSC/spec
Merge pull request #246 from wanderingbort/p2sh-support

P2sh support
Merge pull request #245 from dacoinminster/master

Accurately reflect MSC-only for stage 1 metadex
Adding fees for some advanced features when MSC is not used
Adding fees for some advanced features when MSC is not used
Merge branch 'master' of https://github.com/dacoinminster/spec

Conflicts:
	README.md
Changes based on feedback of pull request #251
Merge pull request #251 from dacoinminster/master

Adding fees for some advanced features when MSC is not used