ok looks like I got the grammar exception to reproduce with the integration test using derby
Merge origin/master

Conflicts:
	src/main/java/org/ferris/generateclient/jpatest/Order.java
	src/main/java/org/ferris/generateclient/jpatest/OrderItem.java
Changed db to app_user and app_address