Add new properties for uploading to S3 buckets in addition to the FTP / HTTPS services.
Extract PA content updater thread count to system property
Resolve equivalents on Person POST/PUT

Extract an IdentifiedModelTransformer super to
DescribedModelTransformer which specifies abstract resolveEquivalents
and resolveSameAs methods for handling the resolution of equivalent's
URIs and SameAses to LookupRefs.
Allow pagination of people using a publisher parameter
Allow pagination of people using a publisher parameter

Conflicts:
	src/main/java/org/atlasapi/query/v2/PeopleController.java
Fix error getting absent person

The PersonQueryResolver returns Optional.absent() when a Person's
source is disabled for the request's application. The subsequent
Optional.get() therefore throws an ISE. This avoids the get() by
simply testing isPresent(). It can't distinguish between a non-
existent person and an invisible person at this point so the return
code is 404.
Set Access-Control-Allow-Origin: * in DispatchingAtlasModelWriter
Ensure newEpisode is set to true if newSeries is true but newEpisode is not.
Equivalence task changes

- Create and schedule TalkTalk VOD equivalence task
- Schedule RT equivalence task
fix test relating to disabled sources in PeopleControllerTest
add missing }
Add glycerin dependency
Guava 15 compatability fixes
up glycerin version
Add initial BBC Nitro adapter
Set Nitro Item title to presentation title if no title.
only schedule nitro tasks if tasks enabled
Add property to allow configuration of upload services used for HTTPS RadioPlayer upload.
Merge branch 'mbst-7051-radioplayer-https-upload' into stage

Conflicts:
	src/main/java/org/atlasapi/equiv/EquivModule.java
	src/main/java/org/atlasapi/equiv/EquivTaskModule.java
	src/main/java/org/atlasapi/remotesite/bbc/nitro/extract/BaseNitroItemExtractor.java
	src/main/java/org/atlasapi/remotesite/bbc/nitro/extract/NitroEpisodeExtractor.java
	src/main/java/org/atlasapi/remotesite/pa/PaRecentUpdater.java
	src/main/resources/config/environment.properties