Fix String.valueOf(java.lang.Object)
Merge branch 'merge3' of github.com:millecker/rootbeer1 into merge4

Conflicts:
	src/org/trifort/rootbeer/entry/ForcedFields.java
	src/org/trifort/rootbeer/test/Main.java