Some changes to the CustomGenerator module, as discussed during teleconference on August 15, 2013.
This is a test of the git-flow feature branch functionality
Enabled 2D images as input in CustomGenerator
Deleting some generated image files