myeclipse
Merge remote-tracking branch 'origin/master'

Conflicts:
	pom.xml
Merge branch 'master' of https://github.com/hc990/datatrade
Merge branch 'master' of https://github.com/hc990/datatrade
Merge branch 'master' of https://github.com/hc990/datatrade
commodity.jsp