Merge pull request #108 from atlasapi/location-jaxb-deserialization

Deserialize Location.available correctly
Fix test
Content merging sort is stable for Content from common source

When merging equivalent content for output make the Comparator return
value 0 for Content from common sources.
Merge pull request #109 from atlasapi/sort-content-merge

Use Ordering.sortedCopy() for Content merge sorting
Fix 'available' flag related NPE in Location.copy()

Avoid auto-unboxing null pointer exception in `Location.copy()` due to
the *available* flag in `Location` being `Boolean` but the `setAvailable`
method parameter being primitive `boolean` for JAXB compatibility.
Merge pull request #110 from atlasapi/fix-location-copy

Fix 'available' flag related NPE in Location.copy()
Add new channels
Add new image type
Merge branch 'mbst-4910-add-alternate-image-type' into stage