Fleshing out table class (WIP)
Resolve conflicts
Implement table model and resource model
Merge branch 'grid-widgets'