cleanup after import
ant to maven
upgrade to java 7
various fixes for jdk 1.7