FOR REVIEW:
-updated the user list page to include research interests
-beginning to implement a "view user profile" page so users can see the contact information and portfolios of other users. Currently the page retrieves only the current user.
-Added a "private profile" boolean field to user model so that users may hide their information from other users.
Merge branch 'Richard' of github.com:YfLn/CEN3031FA14 into Richard
Merge branch 'Richard'

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

Merging master into Richard
Find userByID Added
Added tests
Had to remove window reloads

We should never reload a window in angular but use $location instead.
Using window reloads also breaks karma testing
Settings controller refactoring and added tests

Refactored settings controller methods to more accurately represent
purpose and added tests for setting controller methods
Merge remote-tracking branch 'origin/chris'
USER PROFILES
-renamed "list users" to "User Directory"
-added user profile page, so that you may view other users in the website
-added "privateProfile" boolean field to user model
-users can now make their profile private, hiding research interests, contact information, and portfolio in user directory. This can be done from the "edit profile" page.
-Added various methods to UsersController to achieve similar functions of cleaning up portfolio for viewing in profile page
Merge branch 'Richard' into Master

Conflicts:
	public/modules/databases/views/list-databases.client.view.html
	public/modules/users/controllers/settings.client.controller.js
Merge branch 'Master' into Richard
Merge pull request #59 from YfLn/Richard

User List and User Profiles
Added more tests and minor naming fixes
COMMENTS
-users can now add comments to a database page.
-users can remove their comments from a database's page.
-added "databaseId" field to comments server model to assist in finding the right comments for a database
-removed "comments" array from database server model, as it was not used in my implementation

VIEW DATABASE PAGE
-reorganized page because the comments div made a mess
Database page will query for comments again instead of reloading window on comment creation/deletion.
Added reset comment field after submitting comment
-Accidentally deleted 'user' from DB model instead of 'comments'. This has been corrected.
-Changed findOne() function in usersController to call findAll/clean up portfolio as part of the GET success.
-Removed findAll() from data-ng-init field of portfolio in view user.
Merge branch 'Richard' of github.com:YfLn/CEN3031FA14 into Richard
change userByID req.profile to req.user && little userlist controller bug fix && portfolio test added && comment model test revise && db server controller test remove for now