Merge branch 'Branch_Hien_24_11_2014' of github.com:independence/NKCP into Branch_Hien_24_11_2014
Merge branch 'Branch_Hien_24_11_2014' of github.com:independence/NKCP into Branch_Hien_24_11_2014