Merge pull request #43 from YfLn/master

Updating Elli branch from master
Working out modal bug - ok function
Merge branch 'Elli' of https://github.com/YfLn/CEN3031FA14 into Elli

Forgot to pull first
Changed to one controller for modal
Close modal now works
Modal function added. Still needs backend password validation function
Commiting modal changes
Merge branch 'Elli'
Merge branch 'master' of https://github.com/YfLn/CEN3031FA14

Conflicts:
	public/modules/users/controllers/settings.client.controller.js