Cleaned up import order mess
Merge branch 'master' of github.com:lizardsystem/lizard-fewsjdbc