application/json
Merge branch 'master' of github.com:longlife/hannah.longlife

Conflicts:
	hannah.http/com/hannah/http/util/HttpRequestUtil.java