f

hej
Merge remote-tracking branch 'origin/master'

Conflicts:
	fjortis/KMService/KMService/App_Data/Database.mdf
	fjortis/KMService/KMService/App_Data/Database_log.ldf
	fjortis/KMService/KMService/KMService.v12.suo

	fjortis/KMService/KMService/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

	fjortis/KMService/KMService/obj/Debug/KMService.csproj.FileListAbsolute.txt

	fjortis/KMService/KMService/obj/Debug/KMService.csprojResolveAssemblyReference.cache