Another .gitignore update
Merge branch 'master' of https://github.com/maekitalo/tntnet
Style revision for everything from applicationunlocker to dispatcher {.h|.cpp}
Further style revision
Style revision part 3
Continued style revision [currently breaks build]
Completed style revision for framework/common
Style revision for framework/defcomp
Style revision for framework/runtime
Readded a mistakenly removed include
A little last style update in cookie.h
Merge remote-tracking branch 'upstream/master'

Conflicts:
	framework/common/http.cpp
	framework/common/openssl.cpp
	framework/runtime/main.cpp
set cache control header just once
Merge branch 'jonessen96-master'