Updating README.md and CHANGELOG.md
Merge branch 'master' of https://github.com/omgitstom/stormpath-sdk-java

Conflicts:
	README.md