development: fixed merge conflicts
development: fixed merge conflicts

CosmicMind/MaterialKit,CosmicMind/MaterialKit,CosmicMind/Material,whitepixelstudios/Material,CosmicMind/Material,whitepixelstudios/Material