Updated the View Profile

Updated view profile
Merge branch 'ishins'
Small fix on View Profile's edit button
Merge branch 'ishins'
Merge branch 'master' of https://github.com/YfLn/CEN3031FA14

Conflicts:
	public/modules/users/views/settings/view-profile.client.view.html