Merge pull request #48 from YfLn/Richard

"Edit Portfolio" now working in View Profile page
Add dbusers to view db
Merge pull request #49 from YfLn/Richard

Users List page, portfolios automatically delete bad entries
Merge remote-tracking branch 'origin/master' into chris
Can now see which users are a part of the DB

In the view database page, you can see which users have added the DB as
part of their portfolio.
Minor documentation
Added tests and fixed portfolio bug some more

I think I finally got rid of the portfolio bug where empty shells were
being made. I also added some tests.
Merge branch 'Richard'

Conflicts:
	public/modules/users/controllers/settings.client.controller.js
Merge branch 'master' into Richard

Merging master into Richard