Merging in my .config and .csproj
Merge branch 'master' of https://github.com/oscpa/AptifriedWebApi

Conflicts:
	AptifyProducts/AptifyWebApi.csproj