Bug fixed in first release
Merge conflicts master and team2 solved
Team 2 ready release