Remove compiler warnings.
Merge branch 'SCDemo' of https://github.com/JosephCottam/AbstractRendering into SCDemo

Conflicts:
	java/core/ar/rules/Legend.java