Merge branch 'master' of github.com:Xuyuanp/hodor

Conflicts:
	env.go
	recovery.go
	router.go
Merge branch 'master' of github.com:Xuyuanp/hodor

Conflicts:
	env.go