dash
add support for uploading JP2K images for large image content
various cleanups
merge new islandora upstream, resolve flvc changes to now-deleted functions/xml
allow jp2k to be added
no jp2k mime type supported, work-around temporarily
Merge remote branch 'upstream/7.x' into flvc

Conflicts:
	includes/derivatives.inc

most merged correctly - presumably - but for a parameter type change.
Fix parameter type
Merge remote branch 'upstream/7.x' into flvc
Merge remote branch 'upstream/7.x' into flvc
Merge remote branch 'upstream/7.x' into flvc
Merge remote-tracking branch 'flvc/flvc' into lyr-master

Adds the JP2-in-addition-to-TIFF capability from FLVC.