Merge pull request #55 from YfLn/master

Merging master into Elli
Back-end password verification function added
Merge branch 'Elli' of https://github.com/YfLn/CEN3031FA14 into Elli
revise some front-end changes
Minor changes
Merge branch 'Elli' of https://github.com/YfLn/CEN3031FA14 into Elli

Conflicts:
	public/modules/users/controllers/settings.client.controller.js
Merge pull request #60 from YfLn/Richard

COMMENTS
Modal value being passed, internal server error
switching branch
revise passwordVerification function; POST successful
Modal updated. Signs user out and verifies password
git push origin master Merge branch 'Elli'
Modal updated.Users sign out, redirected, and password verified.
Merge branch 'master' of https://github.com/YfLn/CEN3031FA14

Conflicts:
	public/modules/users/controllers/settings.client.controller.js
	public/modules/users/tests/settings.client.controller.test.js
	public/modules/users/views/settings/edit-profile.client.view.html
Merge pull request #63 from YfLn/master

Merging master into Elli
Clean up
Merge pull request #65 from YfLn/Elli

Merge pull request #63 from YfLn/master
Fixed merge conflicts
Deleted changes to changeUserpassword
Merge pull request #67 from YfLn/master

Updating Richard branch from master