First checkin
Merge branch 'master' of github.com:Metaswitch/sprout into iss403

Conflicts:
	sprout/icscfproxy.cpp
Git issues
Update UTs
Update UTs
Merge pull request #438 from Metaswitch/iss403

[No reviewer] Iss403