Added jp2 as an acceptable file extension on batch process.
Fixed merge conflict.