arf, some issues with default formatting with idea auto matically formatting my files...

Conflicts:
	lib/src/main/java/com/github/kevinsawicki/http/HttpRequest.java
Merge branch 'origin_master'

Conflicts:
	lib/src/main/java/com/github/kevinsawicki/http/HttpRequest.java