- definition changes
- messing with dropdown
merge fixes
Merge branch 'jpecht-master'