these changes should not be in the pull request derived from this branch - removing it
Merge branch 'development' into custom_data

Conflicts:
	stormpath/resource/base.py