Fix User and Create DataService
Delete content UserDAO
Merge branch 'TestBranch' of https://github.com/leviet/VnexitProject.git into TestBranch