Lotsa DB changes. Combini adjustments based on user interface
merge Merge branch 'advanced_controllers'