#minor cleanup in rest/OddballRestService.java
#Security updates
#new properties
Merge branch 'master' of https://github.com/revolutionarysystems/oddball

Conflicts:
	service/src/main/java/uk/co/revsys/oddball/service/rest/OddballRestService.java
Merge branch 'master' of https://github.com/revolutionarysystems/oddball
#Episode Aggregation
#Episodes etc
Merge branch 'master' of https://github.com/revolutionarysystems/oddball