New configuration params, and wiring for Unbox YouView upload.
Refactor import from feeds of conversion from LoveFilm genre to Atlas genre.
Refactor of publisher-specific elements in the YouView upload
 Add flags to switch YV endpoints separately from upload
Add a class to write BBC Service IDs as aliases onto channels, to enable resolution of Service IDs for YouView work.
Merge pull request #574 from atlasapi/9700-youview-bbc-initial-upload

YouView BBC Nitro initial upload
Merge pull request #577 from atlasapi/mbst-9820-youview-initial-output

Mbst 9820 youview initial output
Move Feed-related controllers to main controller package, and wire into QueryWebModule, with associated writers/simplifiers.
Merge branch 'mbst-9831-basic-monitoring' into stage

Conflicts:
	src/main/java/org/atlasapi/ConfigurableAnnotationWebApplicationContext.java
	src/main/java/org/atlasapi/query/QueryWebModule.java