restructuring so that we can build uberjars
Merge branch '2.0-maint' into 2.1-maint
cleanup
Merge branch '2.0-maint' into 2.1-maint
Update pom.xml
Update pom.xml
Merge branch '2.0-maint' into 2.1-maint

Conflicts:
	pom.xml
Merge branch '2.1-maint'

Conflicts:
	benchmark-run/pom.xml
	data-import/pom.xml
	pom.xml
cleanup