merged openjpip changes from trunk
Merge branch 'upstream' into develop
Merge github.com:ksclarke/openjpeg into develop
added the conformance doc from upstream svn
fixed test paths and included openjpeg test data