Update changelog.txt
Fix the concurrency example
Merge pull request #519 from realm/ez-concur

Fix the concurrency example
Merge branch 'master' of github.com:realm/realm-java into kg-bugfix-too-many-query-conditions

Conflicts:
	changelog.txt
Minor update to the changelog