Get httpcon back in track with sprout
Merge pull request #25 from Metaswitch/http_con

[No reviewer] Get httpcon back in track with sprout
Merge branch 'master' of github.com:Metaswitch/cpp-common into new_conn

Conflicts:
	include/httpconnection.h
	src/httpconnection.cpp