ComboDroplist stripped
Conflict resolved
Fixed project setup