Merge remote-tracking branch 'origin/master'

Conflicts:
	src/diameterstack.cpp
Merge remote-tracking branch 'origin/sas_integration'
Add new classes to diameterstack.h
Merge remote-tracking branch 'origin/master' into sto639
Multiple diameter hosts support half complete
SAS event naming tidy-up
Tweak realm resolution
Set up peer_info structure correctly
Add realm back in
Don't do A/AAAA lookup for realm unless NAPTR or SRV record found
Live test fixes
Code almost complete
Change how httpstack is configured
Merge pull request #88 from Metaswitch/ralf_load

[Reviewer: Andy] Change how httpstack is configured
Fix compiler warning
Merge pull request #89 from Metaswitch/ralf_load

[No reviewer] Fix compiler warning
Use shared_ptrs
For code review
Various fixes
Merge remote-tracking branch 'origin/master' into sto639