Merge pull request #61 from jateeter/master

Removed the DataCustodian id constant from configuration.java
Merge remote-tracking branch 'upstream/master'
Added RestTemplate Bean to the test-configuration.xml