fixed merge to develop branch
support for nested dropzones
Merge pull request #1054 from craigrbruce/develop

Support for nested dropzones