attempting to merge with eddie
Merge branch 'master' of github.com:whardier/rwestful-android

Conflicts:
	src/com/rwestful/android/web/services/HTTPService.java