Added MasterServer & MasterDAO
Resolved merge conflicts