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
Back-end fixes && Unfinished database server controller testing
Back-end fixes wasnt added in last commit, now re-commit it
Merge branch 'Richard'

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

Merging master into Richard
Merge branch 'Ishin'
Merge branch 'Ishin'
Changed to one controller for modal
Close modal now works
Full test code for Users, except portfolio tests, and some DB test code for backend
Used database.save instead of user.save, forgot to test, research interests not saving properly
Merge branch 'master' of https://github.com/YfLn/CEN3031FA14 into yufan
Testing Comments
BackEnd: CommentsModel&ServerController&Route&CommentsModelTest FrontEnd: CommentsSubmitForm&DefaultCommentsController(RomoveIntendedHoweverGettingError)&CommentsModule&CommentsService Added RemoveAnythingYouPlease
Merge pull request #52 from YfLn/yufan

Yufan(recent works)
Modal function added. Still needs backend password validation function