add type and top-level param to valid search params
Create task branch on top of xml changes for channel/channelGroup filtering by publisher
Merge pull request #212 from atlasapi/mbst-3962-search-episodes

Search Episodes
Rename isTopLevel flag to isTopLevelOnly
Merge pull request #227 from atlasapi/mbst-4499-channel-filtering

Channel/ChannelGroup filtering by publisher
Add currentBroadcastsOnly filter for search endpoint
Merge pull request #228 from atlasapi/current-broadcasts-only-flag

Add currentBroadcastsOnly filter to search endpoint
Allow currentBroadcastsOnly parameter
Merge pull request #229 from atlasapi/current-broadcasts-only-flag

Allow currentBroadcastsOnly parameter
added activemq-data to git ignore
Lovefilm ingest now pulls csv file from the LoveFilm s3 bucket rather than our own.
Merge branch 'mbst-3512-ingest-from-lovefilm-bucket' into stage

Conflicts:
	pom.xml
	src/main/java/org/atlasapi/query/v2/ChannelController.java
	src/main/java/org/atlasapi/query/v2/ChannelGroupController.java
	src/main/java/org/atlasapi/query/v2/SearchController.java