Moved to Spring 4.0.6
Added SFTP to the Notification Service
added /Subscription/{subscriptionId/UsagePoint and /{usagePointId}
made ResourceService.merge @Transactional as two errors in the SOAPui
tests started showing up ???
Merge pull request #139 from jateeter/master

SFTP; Subscription/Usagepoint; sprint 4.0.6