tpro build
Merge branch 'master' of github.com:hadzim/bb

Conflicts:
	BB.HttpServer/src/HttpServer.cpp