Fix for ResourceReference out of sync
Merge branch 'dev' of https://github.com/stormpath/stormpath-sdk-java into ResourceReference_unsync_fix

Conflicts:
	extensions/httpclient/src/test/groovy/com/stormpath/sdk/impl/client/DefaultClientTest.groovy
Updated readme and some locks improved
Added DefaultCustomData tests
Removed unnecessary change
Fixes for CustomData + Added more tests
Merge branch 'dev' of https://github.com/stormpath/stormpath-sdk-java into ResourceReference_unsync_fix

Conflicts:
	README.md
	extensions/httpclient/src/test/groovy/com/stormpath/sdk/impl/account/AccountIT.groovy
	impl/src/main/java/com/stormpath/sdk/impl/ds/DefaultDataStore.java
Fixing problems caused by the merge
Added fix for failing ApiKey tests
Merge pull request #64 from stormpath/ResourceReference_unsync_fix

Resource reference unsync fix