Merge branch 'software-testing' of https://github.com/jamesmiller5/app into software-testing
Implementing citations
Added general purpose tear down method for deleting entities.

There was no way to cleanly remove citation (or any other entity). Added
delete function to entity base: removes all links so can delete safely,
then deletes.
Merge pull request #13 from cherryn/software-testing

Added general purpose tear down method for deleting entities.
Merge pull request #14 from salter31/software-testing

finished viewTrustNetwork(Email)
added more integration tests for registration
Merge branch 'software-testing' of https://github.com/jamesmiller5/app into software-testing
Merge pull request #15 from abmack/software-testing

Adding integration tests for registration
Work in progress, BROKEN build pushed to share code
Merge remote-tracking branch 'upstream/software-testing' into software-testing

Conflicts:
	src/app/Cli.java
Merge pull request #16 from aphextinez/software-testing

portfolio functions for Citations + delete fix
Fix delete() in Entity.java with tx.success(), add portfolio functions
and integration test for them
Merge pull request #17 from aphextinez/software-testing

Fix delete() in Entity.java with tx.success(), add portfolio functions
fixed things