Hoang Commit
Hoang commit
Hoang Commit
Hoang Makes change
Hoang makes change on hoangbranch
resolved conflict
Merge branch 'master' of https://github.com/hdoanthanh/cxf-rest-project

Conflicts:
	src/main/webapp/index.jsp
hoang resolved conflict