bug fixes
Merge branch 'development' of https://github.com/FactomProject/FactomCode into development