update
Merge branch 'version_1' of https://github.com/outsources/sms_gateway into version_1

Conflicts:
	sms_source/sms_source/sms_source.csproj
h
Merge branch 'version_1' of https://github.com/outsources/sms_gateway into version_1