Merge branches 'master' and 'dev'
Quick revert
Final teamname problem fix
Merge branches 'dev' and 'master' into dev