Merge pull request #43 from YfLn/master

Updating Elli branch from master
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
Working out modal bug - ok function
Merge branch 'Elli' of https://github.com/YfLn/CEN3031FA14 into Elli

Forgot to pull first
Merge branch 'Richard'

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

Merging master into Richard
Changed to one controller for modal
Close modal now works
Modal function added. Still needs backend password validation function
Find userByID Added
Commiting modal changes
Merge branch 'Elli'
Merge branch 'master' of https://github.com/YfLn/CEN3031FA14

Conflicts:
	public/modules/users/controllers/settings.client.controller.js
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