as
Merge remote-tracking branch 'origin/master'

Conflicts:
	StockeAnalysisApplication/StockeAnalysisApplication.v12.suo
	StockeAnalysisApplication/StockeAnalysisApplication/bin/Debug/StockeAnalysisApplication.exe
	StockeAnalysisApplication/StockeAnalysisApplication/bin/Debug/StockeAnalysisApplication.pdb
	StockeAnalysisApplication/StockeAnalysisApplication/obj/Debug/StockeAnalysisApplication.csproj.FileListAbsolute.txt
	StockeAnalysisApplication/StockeAnalysisApplication/obj/Debug/StockeAnalysisApplication.csproj.GenerateResource.Cache
	StockeAnalysisApplication/StockeAnalysisApplication/obj/Debug/StockeAnalysisApplication.csprojResolveAssemblyReference.cache