Add priority channel weighting
Merge branch 'master' into priority-channel-weighting

Conflicts:
	src/main/java/org/atlasapi/query/v2/SearchController.java
Merge pull request #230 from atlasapi/priority-channel-weighting

Add priority channel weighting