Merge pull request #34 from YfLn/yufan

display portfolio in view profile; add function to add dbid to portfolio; add function to get db in portfolio; add portfolio array in user model
Merge pull request #35 from YfLn/master

Updating Richard branch from master
Modal for delete profile created (modal buttons not working)
Modal for delete profile created (modal buttons not working)
Added Unit Testing

Unit tests for functions
Merge branch 'master' into Ishin
Added Portfolio E2E Test

More E2E testing stuff
Merge branch 'Ishin'
Merge pull request #36 from YfLn/master

Updating Richard branch from master
-added check for Database to see if it is already in user's portfolio or not
-added 'Add Database'/'Remove Database From Portfolio' button to View Database page.
Merge pull request #37 from YfLn/Richard

Check for unique database in portfolio, remove database from portfolio
Renamed "addDatabase" and "removeDatabase" functions to "addDatabaseToPortfolio" and "removeDatabaseFromPortfolio".
Merge pull request #38 from YfLn/Richard

Renamed "addDatabase" and "removeDatabase" functions to "addDatabaseToPo...
Changed database controller

Need to use scope.user before first and just update Authentication.user
if update is successful
Merge pull request #39 from YfLn/master

Updating Richard branch from Master
Merge branch 'master' of https://github.com/YfLn/CEN3031FA14 into Elli

Conflicts:
	public/modules/users/controllers/settings.client.controller.js
Merge branch 'master' of https://github.com/YfLn/CEN3031FA14 into Elli

Merging Elli branch
Merge pull request #40 from YfLn/Elli

Elli
-Added addDatabase/removeDatabase portfolio buttons to database list view.
Merge pull request #41 from YfLn/master

Updating Richard branch from master
Merge pull request #42 from YfLn/Richard

Add to portfolio/remove from portfolio added to list database