remove outdated test files
clean up code
Merge branch 'development' of https://github.com/FactomProject/FactomCode into development
add block header for entry block and factom block, and merkle tree