edit user data table model
Merge branch 'ardfo' of https://github.com/ardfo/dev into ardfo