Added subtypes to GridZones
Merge branch 'master' of https://github.com/VajraFramework/Vajra