fixing bug dataSource
Merge branches 'master' and 'master' of https://github.com/plansys/plansys