adding drop down tabs
Add field name as legend
enable tab dropdowns
removing conflict
Merge branch '3.2'