Small fix to get image annotations, optionally return json or array.
Corrected merge conflict.
Removed merge conflict code.
Merge pull request #38 from MorganDawe/7.x.version_viewer_fixes

7.x.version viewer fixes