Merge branch 'f_add_teams_list' into develop

Conflicts:
	README.md