Merge branch 'feature_teams_api' of https://github.com/former03/gitlabhq into former0...

Conflicts:
	doc/api/README.md

diff --cc doc/api/README.md
index 16af64b,09deec0..c3cfc0e
--- 1/doc/api/README.md
--- 2/doc/api/README.md
+++ b/doc/api/README.md
@@@ -69,13 -69,14 +69,14 @@@ When listing resources you can pass th
  
  ## Contents
  
 -+ [Users](https://github.com/gitlabhq/gitlabhq/blob/master/doc/api/users.md)
 -+ [Session](https://github.com/gitlabhq/gitlabhq/blob/master/doc/api/session.md)
 -+ [Projects](https://github.com/gitlabhq/gitlabhq/blob/master/doc/api/projects.md)
 -+ [Groups](https://github.com/gitlabhq/gitlabhq/blob/master/doc/api/groups.md)
 -+ [Snippets](https://github.com/gitlabhq/gitlabhq/blob/master/doc/api/snippets.md)
 -+ [Repositories](https://github.com/gitlabhq/gitlabhq/blob/master/doc/api/repositories.md)
 -+ [Issues](https://github.com/gitlabhq/gitlabhq/blob/master/doc/api/issues.md)
 -+ [Milestones](https://github.com/gitlabhq/gitlabhq/blob/master/doc/api/milestones.md)
 -+ [Notes](https://github.com/gitlabhq/gitlabhq/blob/master/doc/api/notes.md)
 -+ [System Hooks](https://github.com/gitlabhq/gitlabhq/blob/master/doc/api/system_hooks.md)
 -+ [User Teams](https://github.com/gitlabhq/gitlabhq/blob/master/doc/api/user_teams.md)
 ++ [Users](doc/api/users.md)
 ++ [Session](doc/api/session.md)
 ++ [Projects](doc/api/projects.md)
 ++ [Groups](doc/api/groups.md)
 ++ [Snippets](doc/api/snippets.md)
 ++ [Repositories](doc/api/repositories.md)
 ++ [Issues](doc/api/issues.md)
 ++ [Milestones](doc/api/milestones.md)
 ++ [Notes](doc/api/notes.md)
 ++ [System Hooks](doc/api/system_hooks.md)
+++ [User Teams](doc/api/user_teams.md)

diff --cc lib/api/api.rb
Simple merge