Merge branch 'Update-to-Play-framework-2.3.1'
Merge branch 'master' of https://github.com/BandwidthOnDemand/nsi-requester