Making annotation droppable to segmentList
Solving conflicts
Solving another conflict
Merge branch 'develop' of github.com:ImaginationForPeople/assembl into develop