fixed merge conflicts
Merge branch 'developer' of https://github.com/djkirby/wpi-suite-tng into developer
Fixed broken test cases and bug with storing a transaction history for a name that is more than 100 chars