test conflic merger
Merge branch 'master' of https://github.com/hdoanthanh/cxf-rest-project