test
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/ning/maven/plugins/duplicatefinder/ClasspathDescriptor.java
	src/main/java/com/ning/maven/plugins/duplicatefinder/DuplicateFinderMojo.java