add OrderBean
Merge origin/master

Conflicts:
	amasoon/src/main/webapp/resources/resultGrid.xhtml