Merge pull request #2 from timheuer/dev

Sync with upstream
Added design time support
Clean up unused configurations
Merge pull request #232 from dotMorten/dev

Added DesignTime support to Callisto