-- Changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/Response.java
	src/test/java/ResponseTest.java