Merge branches 'Branck_Hien2_15112014' and 'Linh_backup' of github.com:independence/NKCP into Branck_Hien2_15112014

Conflicts:
	RoomManager/frmMain.cs
Điều chỉnh lại giao diện
Merge branch 'Branck_Hien2_15112014' of github.com:independence/NKCP into Branch_Hiennv_24_11_2014

Conflicts:
	RoomManager/frmMain.cs