moving things around

moving things around
Merge remote-tracking branch 'origin/master'

Conflicts:
	SMSClient.v12.suo
	SMSClient/Components/HandleResponse.cs
	SMSClient/Components/SmsResponse.cs
	SMSClient/Controllers/HomeController.cs
	SMSClient/Models/ActiveRegistry.cs
	SMSClient/Models/SurveyInstance.cs
	SMSClient/Models/Team3.cs
	SMSClient/bin/SMSClient.dll
	SMSClient/bin/SMSClient.pdb
	SMSClient/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	SMSClient/obj/Debug/SMSClient.csproj.FileListAbsolute.txt
	SMSClient/obj/Debug/SMSClient.csprojResolveAssemblyReference.cache
	SMSClient/obj/Debug/SMSClient.dll
	SMSClient/obj/Debug/SMSClient.pdb