Merge from tutorial_island (merged all shader changes keeping changes from tutorial_island, since they should be the most up to date)