move to grid2.0 framework.
Merge remote-tracking branch 'duty/master'

Conflicts:
	srcresources/struts-backend.xml