Merge pull request #72 from MartyBurns/master

Merge of retailtosubscription into master
Modified calls to new @Autowired setters