moving jetty into web module
adding java 1.6 in the pom
organizing imports
Merge branch 'develop' into curated_computed_largescale_publication