updated views_datasource
Merge branch 'dev'