diff --git a/app/views/teams/members/edit.html.haml b/app/views/teams/members/edit.html.haml
new file mode 100644
index 00000000000..a2742977717
--- /dev/null
+++ b/app/views/teams/members/edit.html.haml
@@ -0,0 +1,2 @@
+%h1 Teams::Members#edit
+%p Find me in app/views/teams/members/edit.html.haml
\ No newline at end of file
diff --git a/app/views/teams/members/import.html.haml b/app/views/teams/members/import.html.haml
new file mode 100644
index 00000000000..de82f416248
--- /dev/null
+++ b/app/views/teams/members/import.html.haml
@@ -0,0 +1,17 @@
+= render "projects/project_head"
+
+%h3.page_title
+  = "Import team from another project"
+%hr
+%p.slead
+  Read more about team import #{link_to "here", '#', class: 'vlink'}.
+= form_tag apply_import_project_team_members_path(@project), method: 'post' do
+  %p.slead Choose project you want to use as team source:
+  .padded
+    = label_tag :source_project_id, "Project"
+    .input= select_tag(:source_project_id, options_from_collection_for_select(current_user.authorized_projects, :id, :name_with_namespace), prompt: "Select project", class: "chosen xxlarge", required: true)
+
+  .actions
+    = submit_tag 'Import', class: "btn save-btn"
+    = link_to "Cancel", project_team_index_path(@project), class: "btn cancel-btn"
+
diff --git a/spec/controllers/admin/teams_controller_spec.rb b/spec/controllers/admin/teams_controller_spec.rb
new file mode 100644
index 00000000000..02d8f86a79d
--- /dev/null
+++ b/spec/controllers/admin/teams_controller_spec.rb
@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+describe Admin::TeamsController do
+
+  describe "GET 'index'" do
+    it "returns http success" do
+      get 'index'
+      response.should be_success
+    end
+  end
+
+  describe "GET 'show'" do
+    it "returns http success" do
+      get 'show'
+      response.should be_success
+    end
+  end
+
+  describe "GET 'create'" do
+    it "returns http success" do
+      get 'create'
+      response.should be_success
+    end
+  end
+
+  describe "GET 'edit'" do
+    it "returns http success" do
+      get 'edit'
+      response.should be_success
+    end
+  end
+
+  describe "GET 'update'" do
+    it "returns http success" do
+      get 'update'
+      response.should be_success
+    end
+  end
+
+  describe "GET 'destroy'" do
+    it "returns http success" do
+      get 'destroy'
+      response.should be_success
+    end
+  end
+
+end
diff --git a/spec/controllers/teams/members_controller_spec.rb b/spec/controllers/teams/members_controller_spec.rb
new file mode 100644
index 00000000000..e1ac558a6cd
--- /dev/null
+++ b/spec/controllers/teams/members_controller_spec.rb
@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+describe Teams::MembersController do
+
+  describe "GET 'index'" do
+    it "returns http success" do
+      get 'index'
+      response.should be_success
+    end
+  end
+
+  describe "GET 'new'" do
+    it "returns http success" do
+      get 'new'
+      response.should be_success
+    end
+  end
+
+  describe "GET 'create'" do
+    it "returns http success" do
+      get 'create'
+      response.should be_success
+    end
+  end
+
+  describe "GET 'edit'" do
+    it "returns http success" do
+      get 'edit'
+      response.should be_success
+    end
+  end
+
+  describe "GET 'update'" do
+    it "returns http success" do
+      get 'update'
+      response.should be_success
+    end
+  end
+
+  describe "GET 'destroy'" do
+    it "returns http success" do
+      get 'destroy'
+      response.should be_success
+    end
+  end
+
+end
diff --git a/spec/controllers/teams/projects_controller_spec.rb b/spec/controllers/teams/projects_controller_spec.rb
new file mode 100644
index 00000000000..b379c3721bb
--- /dev/null
+++ b/spec/controllers/teams/projects_controller_spec.rb
@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+describe Teams::ProjectsController do
+
+  describe "GET 'index'" do
+    it "returns http success" do
+      get 'index'
+      response.should be_success
+    end
+  end
+
+  describe "GET 'new'" do
+    it "returns http success" do
+      get 'new'
+      response.should be_success
+    end
+  end
+
+  describe "GET 'create'" do
+    it "returns http success" do
+      get 'create'
+      response.should be_success
+    end
+  end
+
+  describe "GET 'edit'" do
+    it "returns http success" do
+      get 'edit'
+      response.should be_success
+    end
+  end
+
+  describe "GET 'update'" do
+    it "returns http success" do
+      get 'update'
+      response.should be_success
+    end
+  end
+
+  describe "GET 'destroy'" do
+    it "returns http success" do
+      get 'destroy'
+      response.should be_success
+    end
+  end
+
+end
diff --git a/spec/controllers/teams_controller_spec.rb b/spec/controllers/teams_controller_spec.rb
new file mode 100644
index 00000000000..923261fce9c
--- /dev/null
+++ b/spec/controllers/teams_controller_spec.rb
@@ -0,0 +1,54 @@
+require 'spec_helper'
+
+describe TeamsController do
+
+  describe "GET 'index'" do
+    it "returns http success" do
+      get 'index'
+      response.should be_success
+    end
+  end
+
+  describe "GET 'show'" do
+    it "returns http success" do
+      get 'show'
+      response.should be_success
+    end
+  end
+
+  describe "GET 'new'" do
+    it "returns http success" do
+      get 'new'
+      response.should be_success
+    end
+  end
+
+  describe "GET 'edit'" do
+    it "returns http success" do
+      get 'edit'
+      response.should be_success
+    end
+  end
+
+  describe "GET 'update'" do
+    it "returns http success" do
+      get 'update'
+      response.should be_success
+    end
+  end
+
+  describe "GET 'create'" do
+    it "returns http success" do
+      get 'create'
+      response.should be_success
+    end
+  end
+
+  describe "GET 'destroy'" do
+    it "returns http success" do
+      get 'destroy'
+      response.should be_success
+    end
+  end
+
+end
diff --git a/spec/helpers/admin/teams_helper_spec.rb b/spec/helpers/admin/teams_helper_spec.rb
new file mode 100644
index 00000000000..5ed6073297b
--- /dev/null
+++ b/spec/helpers/admin/teams_helper_spec.rb
@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+# Specs in this file have access to a helper object that includes
+# the Admin::TeamsHelper. For example:
+#
+# describe Admin::TeamsHelper do
+#   describe "string concat" do
+#     it "concats two strings with spaces" do
+#       helper.concat_strings("this","that").should == "this that"
+#     end
+#   end
+# end
+describe Admin::TeamsHelper do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/helpers/teams/members_helper_spec.rb b/spec/helpers/teams/members_helper_spec.rb
new file mode 100644
index 00000000000..a8e227aa063
--- /dev/null
+++ b/spec/helpers/teams/members_helper_spec.rb
@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+# Specs in this file have access to a helper object that includes
+# the Teams::MembersHelper. For example:
+#
+# describe Teams::MembersHelper do
+#   describe "string concat" do
+#     it "concats two strings with spaces" do
+#       helper.concat_strings("this","that").should == "this that"
+#     end
+#   end
+# end
+describe Teams::MembersHelper do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/helpers/teams/projects_helper_spec.rb b/spec/helpers/teams/projects_helper_spec.rb
new file mode 100644
index 00000000000..836d1dca018
--- /dev/null
+++ b/spec/helpers/teams/projects_helper_spec.rb
@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+# Specs in this file have access to a helper object that includes
+# the Teams::ProjectsHelper. For example:
+#
+# describe Teams::ProjectsHelper do
+#   describe "string concat" do
+#     it "concats two strings with spaces" do
+#       helper.concat_strings("this","that").should == "this that"
+#     end
+#   end
+# end
+describe Teams::ProjectsHelper do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/helpers/teams_helper_spec.rb b/spec/helpers/teams_helper_spec.rb
new file mode 100644
index 00000000000..95726163e35
--- /dev/null
+++ b/spec/helpers/teams_helper_spec.rb
@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+# Specs in this file have access to a helper object that includes
+# the TeamsHelper. For example:
+#
+# describe TeamsHelper do
+#   describe "string concat" do
+#     it "concats two strings with spaces" do
+#       helper.concat_strings("this","that").should == "this that"
+#     end
+#   end
+# end
+describe TeamsHelper do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/views/admin/teams/create.html.haml_spec.rb b/spec/views/admin/teams/create.html.haml_spec.rb
new file mode 100644
index 00000000000..27f57d89693
--- /dev/null
+++ b/spec/views/admin/teams/create.html.haml_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe "teams/create.html.haml" do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/views/admin/teams/destroy.html.haml_spec.rb b/spec/views/admin/teams/destroy.html.haml_spec.rb
new file mode 100644
index 00000000000..87670e4dc66
--- /dev/null
+++ b/spec/views/admin/teams/destroy.html.haml_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe "teams/destroy.html.haml" do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/views/admin/teams/edit.html.haml_spec.rb b/spec/views/admin/teams/edit.html.haml_spec.rb
new file mode 100644
index 00000000000..5180d713f7f
--- /dev/null
+++ b/spec/views/admin/teams/edit.html.haml_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe "teams/edit.html.haml" do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/views/admin/teams/index.html.haml_spec.rb b/spec/views/admin/teams/index.html.haml_spec.rb
new file mode 100644
index 00000000000..7a0d69bd316
--- /dev/null
+++ b/spec/views/admin/teams/index.html.haml_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe "teams/index.html.haml" do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/views/admin/teams/show.html.haml_spec.rb b/spec/views/admin/teams/show.html.haml_spec.rb
new file mode 100644
index 00000000000..b7f7b669c2e
--- /dev/null
+++ b/spec/views/admin/teams/show.html.haml_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe "teams/show.html.haml" do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/views/admin/teams/update.html.haml_spec.rb b/spec/views/admin/teams/update.html.haml_spec.rb
new file mode 100644
index 00000000000..b28cfa4f699
--- /dev/null
+++ b/spec/views/admin/teams/update.html.haml_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe "teams/update.html.haml" do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/views/teams/create.html.haml_spec.rb b/spec/views/teams/create.html.haml_spec.rb
new file mode 100644
index 00000000000..27f57d89693
--- /dev/null
+++ b/spec/views/teams/create.html.haml_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe "teams/create.html.haml" do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/views/teams/destroy.html.haml_spec.rb b/spec/views/teams/destroy.html.haml_spec.rb
new file mode 100644
index 00000000000..87670e4dc66
--- /dev/null
+++ b/spec/views/teams/destroy.html.haml_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe "teams/destroy.html.haml" do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/views/teams/edit.html.haml_spec.rb b/spec/views/teams/edit.html.haml_spec.rb
new file mode 100644
index 00000000000..5180d713f7f
--- /dev/null
+++ b/spec/views/teams/edit.html.haml_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe "teams/edit.html.haml" do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/views/teams/index.html.haml_spec.rb b/spec/views/teams/index.html.haml_spec.rb
new file mode 100644
index 00000000000..7a0d69bd316
--- /dev/null
+++ b/spec/views/teams/index.html.haml_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe "teams/index.html.haml" do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/views/teams/members/create.html.haml_spec.rb b/spec/views/teams/members/create.html.haml_spec.rb
new file mode 100644
index 00000000000..b6f817617e4
--- /dev/null
+++ b/spec/views/teams/members/create.html.haml_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe "members/create.html.haml" do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/views/teams/members/destroy.html.haml_spec.rb b/spec/views/teams/members/destroy.html.haml_spec.rb
new file mode 100644
index 00000000000..3ff1634461c
--- /dev/null
+++ b/spec/views/teams/members/destroy.html.haml_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe "members/destroy.html.haml" do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/views/teams/members/edit.html.haml_spec.rb b/spec/views/teams/members/edit.html.haml_spec.rb
new file mode 100644
index 00000000000..3e952e898a9
--- /dev/null
+++ b/spec/views/teams/members/edit.html.haml_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe "members/edit.html.haml" do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/views/teams/members/index.html.haml_spec.rb b/spec/views/teams/members/index.html.haml_spec.rb
new file mode 100644
index 00000000000..363430d769f
--- /dev/null
+++ b/spec/views/teams/members/index.html.haml_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe "members/index.html.haml" do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/views/teams/members/new.html.haml_spec.rb b/spec/views/teams/members/new.html.haml_spec.rb
new file mode 100644
index 00000000000..f03eed1f29f
--- /dev/null
+++ b/spec/views/teams/members/new.html.haml_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe "members/new.html.haml" do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/views/teams/members/update.html.haml_spec.rb b/spec/views/teams/members/update.html.haml_spec.rb
new file mode 100644
index 00000000000..43b84bad99b
--- /dev/null
+++ b/spec/views/teams/members/update.html.haml_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe "members/update.html.haml" do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/views/teams/new.html.haml_spec.rb b/spec/views/teams/new.html.haml_spec.rb
new file mode 100644
index 00000000000..8ef621b708f
--- /dev/null
+++ b/spec/views/teams/new.html.haml_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe "teams/new.html.haml" do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/views/teams/projects/create.html.haml_spec.rb b/spec/views/teams/projects/create.html.haml_spec.rb
new file mode 100644
index 00000000000..74c4ee2d837
--- /dev/null
+++ b/spec/views/teams/projects/create.html.haml_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe "projects/create.html.haml" do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/views/teams/projects/destroy.html.haml_spec.rb b/spec/views/teams/projects/destroy.html.haml_spec.rb
new file mode 100644
index 00000000000..b3eee48f38b
--- /dev/null
+++ b/spec/views/teams/projects/destroy.html.haml_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe "projects/destroy.html.haml" do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/views/teams/projects/edit.html.haml_spec.rb b/spec/views/teams/projects/edit.html.haml_spec.rb
new file mode 100644
index 00000000000..ef41b7b0814
--- /dev/null
+++ b/spec/views/teams/projects/edit.html.haml_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe "projects/edit.html.haml" do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/views/teams/projects/index.html.haml_spec.rb b/spec/views/teams/projects/index.html.haml_spec.rb
new file mode 100644
index 00000000000..8cf0dbcd954
--- /dev/null
+++ b/spec/views/teams/projects/index.html.haml_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe "projects/index.html.haml" do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/views/teams/projects/new.html.haml_spec.rb b/spec/views/teams/projects/new.html.haml_spec.rb
new file mode 100644
index 00000000000..9ee68e5ae05
--- /dev/null
+++ b/spec/views/teams/projects/new.html.haml_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe "projects/new.html.haml" do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/views/teams/projects/update.html.haml_spec.rb b/spec/views/teams/projects/update.html.haml_spec.rb
new file mode 100644
index 00000000000..fdaafd3924b
--- /dev/null
+++ b/spec/views/teams/projects/update.html.haml_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe "projects/update.html.haml" do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/views/teams/show.html.haml_spec.rb b/spec/views/teams/show.html.haml_spec.rb
new file mode 100644
index 00000000000..b7f7b669c2e
--- /dev/null
+++ b/spec/views/teams/show.html.haml_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe "teams/show.html.haml" do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/views/teams/update.html.haml_spec.rb b/spec/views/teams/update.html.haml_spec.rb
new file mode 100644
index 00000000000..b28cfa4f699
--- /dev/null
+++ b/spec/views/teams/update.html.haml_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe "teams/update.html.haml" do
+  pending "add some examples to (or delete) #{__FILE__}"
+end