Maintain a content group with MetaBroadcast picks, based on
prime-time broadcasts from a provided channel group.
Merge branch 'mbst-picks-from-schedule' into stage

Conflicts:
	src/main/java/org/atlasapi/ConfigurableAnnotationWebApplicationContext.java
	src/main/resources/config/environment.properties