BufferedImages are now stored within Image.

Conflicts:

	src/phd/image/OpticalImage.java
BufferedImages are now stored within Image.

Conflicts:

	src/phd/image/OpticalImage.java
Finish merge. Added CleanFilter.