Merge pull request #20 from myrle-krantz/develop

Fixing demo-server with latest changes to portfolio.  Adding chart of accounts.