Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

app/views/groups/_projects.html.haml

@@ -8,7 +8,7 @@
           New project
   %ul.well-list
     - if projects.blank?
-      .nothing-here-block This groups has no projects yet
+      .nothing-here-block This group has no projects yet
     - projects.each do |project|
       %li.project-row
         = link_to project_path(project), class: dom_class(project) do

app/views/groups/edit.html.haml

@@ -45,7 +45,7 @@
                     - if @group.avatar?
                       You can change your group avatar here
                     - else
-                      You can upload an group avatar here
+                      You can upload a group avatar here
                   %a.choose-btn.btn.btn-small.js-choose-group-avatar-button
                     %i.icon-paper-clip
                     %span Choose File ...