Merge pull request #13 from ssirushchyshyn/develop

Develop
Changed datasource name for s3bucket template
Merge remote-tracking branch 'upstream/develop' into develop