lin improvements
Merge branch 'master' of github.com:hadzim/bb

Conflicts:
	BB/src/ForwardApp.cpp
	BB/src/Forwarder/HttpServer/HttpServerForwarder.cpp