moving code out of .h file
Merge branch 'michael-0921' of https://github.com/mastercoin-msc/mastercore into michael-0921

Conflicts:
	src/mastercore.h

post merge