Renamed total_tokens to num_tokens to make it more appropriate for TX51
Tidy merge conflicts
Merge branch 'michael-0921' of github.com:mastercoin-MSC/mastercore into michael-0921_z

Conflicts:
	src/mastercore.cpp
Merge pull request #63 from zathras-crypto/michael-0921_z

Renamed total_tokens to num_tokens to make it more appropriate for TX51