Output entities in alphabetical order
Remove old wicket integration
Netbeans changes