overhaul ImageCleanupTask, to fix issue #97 and issue #102
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:ustav/cwac-camera