Merging DevGDX into master

Will use a different branch for the actual GDX development.