update 1 xiu
Merge branch 'master' of https://github.com/AprilLab/idoldongnhi

Conflicts:
	IdolDongNhi/IdolDongNhi.xcodeproj/project.pbxproj
	IdolDongNhi/IdolDongNhi/AppDelegate.m
	IdolDongNhi/IdolDongNhi/GUI/News/NewsViewController.m