rename machine to tile
Merge branch 'origin/develop'