hoho
hoho
Merge branch 'master' of https://github.com/AprilLab/idoldongnhi

Conflicts:

IdolDongNhi/IdolDongNhi.xcodeproj/project.xcworkspace/xcuserdata/VK.xcus
erdatad/UserInterfaceState.xcuserstate
ko hieu noi