Merge pull request #98 from osiam/develop

Release
Merge pull request #108 from osiam/develop

Develop
Merge pull request #171 from osiam/develop

Develop
changed versions to 1.0
[fix] added charset=utf-8 string to expected response type
Merge pull request #176 from dacrome/fixed-controller-test

[fix] added charset=utf-8 string to expected response type
[merge] reslove merge conflicts
Merge branch 'master' of github.com:osiam/connector4java-integration-tests into osng-480