Change some imports to fit OrientDB 2.0-M2
Merge remote-tracking branch 'origin/master' into withXLSimport

Conflicts:
	pom.xml

	Upgrade to 2.0-M2