Team 1 release
Merging master and team1
Team 1 completed release
Merging team1 and master, conflicts solved
Second release