Fixed bug in dropping view
Added compatibility for collection groups as view targets
Merge remote-tracking branch 'origin/master'