Fixed re-indexing when elements and drop zones are removed. Fixes the bug where drop zones change correct solution when an old element is removed. And the bug where elements change drop zones when an old drop zone is removed.
Merge branch 'master' into api-1.1