[Fix] Add Shift - Update list of shift category in case any change
[Enh] List setting for Other Screen
Merge pull request #41 from jellydn/phu-branch

[Fix] Add Shift - Update list of shift category in case any change
Merge pull request #42 from jellydn/TienLP

Tien lp
Merge branch 'master' into TienLP