Merge pull request #70 from YfLn/master

Merging master into Elli
Styling. Updated UI visual experience/organization
Merge branch 'Elli' of https://github.com/YfLn/CEN3031FA14 into Elli

Conflicts:
	public/modules/users/views/settings/edit-profile.client.view.html
Merge pull request #71 from YfLn/Elli

Styling. Updated UI experience/organization