Parsers for Accept-Contact and Reject-Contact
proxy_calculate_targets() doesn't use the TrustBoundary argument
Stateful proxy changes
Add function skeletons and prototypes
Change Bindings to store parameters in a std::map rather than a list of pairs
Extend the definiton of Target to hold a q-value
New string constants
First draft of code complete
Merge remote-tracking branch 'origin/master' into contact-filtering
First phase of UT, all Contact header tests are broken
Convert to : for ranges
Mainline implicit features test
Implicit feature sets done
Temporary UT fix for Contact matching
Markups and finish UT
Merge remote-tracking branch 'origin/master' into contact-filtering
Merge remote-tracking branch 'origin/dev' into contact-filtering

Conflicts:
	include/constants.h
	sprout/Makefile
Merge remote-tracking branch 'origin/dev' into contact-filtering
Merge remote-tracking branch 'origin/dev' into contact-filtering
Merge pull request #645 from Metaswitch/contact-filtering

Reviewer Rob - Contact filtering