Merge pull request #16 from aphextinez/software-testing

portfolio functions for Citations + delete fix
Merge pull request #17 from aphextinez/software-testing

Fix delete() in Entity.java with tx.success(), add portfolio functions
fixed things
updated the testing files
Merge pull request #18 from salter31/software-testing

Updated view network functions and added integration tests
Add -Xlint:unchecked for more verbose build messages
Formatting for Cli.java, no functional changes
Fix misspelling of portfolio
Fix misspelling of portfolio
Merge branch 'software-testing' of github.com:jamesmiller5/app into software-testing
ng of portfolio

Fix misspelling of portfolio

Conflicts:
	src/app/Cli.java
Removed registerEmail method as it's a duplicate of sign-up
Updated documentation
Added more error checking around input
Merge branch 'software-testing' of https://github.com/aphextinez/app into aphextinez-software-testing

Conflicts:
	src/app/Cli.java
Trust integration test
Added shared email validation to cli.java
updated the testing files
Merge remote-tracking branch 'upstream/software-testing' into software-testing

Conflicts:
	src/app/Cli.java
	src/test/integrate/ViewSubjectiveNetwork.java
	src/test/integrate/ViewTrustNetwork.java
Merge pull request #20 from salter31/software-testing

Finished network viewing tests and added negative result
Updating Cli to use validateEmail methods for trust networks
Fix init bug
Nice toString
Fixing cli