Merge branch 'master' into fix_history_mess

Conflicts:
	team.txt
Merge branch 'fix_history_mess' into develop

Conflicts:
	team.txt