update data model and remove seeder
update Date JSON
Merge branch 'develop2'