remove dwr files, move to JPA 2.0, add sort_order column