PETE: Type and GridPaneUtil
Merge remote-tracking branch 'origin/master'