Not finish master_dao and master_add yet.
Merge remote-tracking branch 'origin/master'