Models updated for new db tables, function names changed to make more sense in tablestocharts, validation methods being changed
Merge branch 'feature/visualisations' of codebasehq.com:playgen/celar/datacon into feature/visualisations
Merge branch 'feature/angular' into feature/visualisations