Merge branches 'api_key_authentication' and 'dev' of https://github.com/stormpath/stormpath-sdk-java into api_key_authentication

Conflicts:
	api/src/main/java/com/stormpath/sdk/account/Account.java
	extensions/httpclient/src/test/groovy/com/stormpath/sdk/impl/account/AccountIT.groovy
	extensions/httpclient/src/test/groovy/com/stormpath/sdk/impl/application/ApplicationIT.groovy
	impl/src/main/java/com/stormpath/sdk/impl/account/DefaultAccount.java
	impl/src/main/java/com/stormpath/sdk/impl/application/DefaultApplication.java
	impl/src/main/java/com/stormpath/sdk/impl/ds/DefaultDataStore.java
	impl/src/main/java/com/stormpath/sdk/impl/ds/InternalDataStore.java
	impl/src/test/groovy/com/stormpath/sdk/impl/account/DefaultAccountTest.groovy