rename order to ordr to prevent name clash with sql and jql keywords
Merge branch 'master' of github.com:shinmeiryu/PTS-ESDGrandCafe

Conflicts:
	src/java/service/OrderingService.java