Fixed compatibility issue with Java 6
Merge branch 'master' of local repository into externalizeMenu

Conflicts:
	src/foldr/main/GUI.java