Merging changes from tutorialOverlay branch on skinny.js repo