Update model and GenericService
Merge branch 'master' of https://github.com/ChristianChen/Alipeach