updating .gitignore
Merge branch 'master' into dev
rename fixture
Updated models and fixture
core table-based rendering in place
Merge branch 'dev'