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

Conflicts:
	doc/api/README.md