Merge branch 'dev' into account_store_mapping

Conflicts:
	extensions/httpclient/src/test/groovy/com/stormpath/sdk/client/DirectoryIT.groovy