PMD Violations fixed
Merge branch 'master' of https://github.com/groggi/eth-jcd

Conflicts:
	gui/src/ch/se/inf/ethz/jcd/batman/model/SearchDirectory.java