Merge branch 'profile-settings' into 'master'

Rename profile settings navigation to "Profile Settings" 

Fixes #2555 

See merge request !1926

app/views/layouts/nav/_dashboard.html.haml

@@ -42,7 +42,7 @@
       = link_to profile_path, title: 'Profile settings', data: {toggle: 'tooltip', placement: 'bottom'} do
         = icon('user fw')
         %span
-          Profile
+          Profile Settings
   = nav_link(controller: :help) do
     = link_to help_path, title: 'Help', data: {placement: 'right'} do
       = icon('question-circle fw')

app/views/layouts/profile.html.haml

-- page_title    "Settings"
-- header_title  "Settings", profile_path
+- page_title    "Profile Settings"
+- header_title  "Profile Settings", profile_path
 - sidebar       "profile"
 
 = render template: "layouts/application"