tidy
update dev todo data
Merge branch 'develop'