Cuong

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

Conflicts:
	IdolDongNhi/IdolDongNhi.xcodeproj/project.pbxproj
Cuong

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