removed requirement that buildDataSource needs to be implemented by base view controllers
Merge branch 'master' into calendar-selection