Merge branch 'mbst-9990-be-actions'

Conflicts:
	src/main/java/org/atlasapi/query/QueryWebModule.java
	src/main/java/org/atlasapi/query/v2/ContentFeedController.java
	src/main/resources/config/environment.properties