Modal for delete profile created (modal buttons not working)
Modal for delete profile created (modal buttons not working)
Merge branch 'master' of https://github.com/YfLn/CEN3031FA14 into Elli

Conflicts:
	public/modules/users/controllers/settings.client.controller.js
Merge branch 'master' of https://github.com/YfLn/CEN3031FA14 into Elli

Merging Elli branch
Merge pull request #40 from YfLn/Elli

Elli
Merge pull request #41 from YfLn/master

Updating Richard branch from master