dani
Merge branch 'master' of github.com:jcanell4/iocProcessingImageApplet

Conflicts:
	ioc/wiki/processingmanager/applet/ImageGeneratorApplet.form
	ioc/wiki/processingmanager/applet/ImageGeneratorApplet.java