Misc commit
Some cdv file complaints

Conflicts:
	.classpath