a
Merge branch 'origin/master'

Conflicts:
	MM Systems/PanoramaApp3/PanoramaApp3.v11.suo
	MM Systems/PanoramaApp3/PanoramaApp3/Bin/Debug/PanoramaApp3.dll
	MM Systems/PanoramaApp3/PanoramaApp3/Bin/Debug/PanoramaApp3.pdb
	MM Systems/PanoramaApp3/PanoramaApp3/Bin/Debug/PanoramaApp3.xap
	MM Systems/PanoramaApp3/PanoramaApp3/obj/Debug/PanoramaApp3.csprojResolveAssemblyReference.cache
	MM Systems/PanoramaApp3/PanoramaApp3/obj/Debug/PanoramaApp3.dll
	MM Systems/PanoramaApp3/PanoramaApp3/obj/Debug/PanoramaApp3.pdb
	MM Systems/PanoramaApp3/PanoramaApp3/obj/Debug/XapCacheFile.xml
	MM Systems/PanoramaApp3/PasswordHashGen/obj/Debug/PasswordHashGen.csproj.FileListAbsolute.txt
	MM Systems/PanoramaApp3/WcfService/Wcf/obj/Debug/Wcf.csprojResolveAssemblyReference.cache
	MM Systems/WebApp/WebApp.Web/ClientBin/WebApp.xap
	MM Systems/WebApp/WebApp.v11.suo
	MM Systems/WebApp/WebApp/Bin/Debug/WebApp.dll
	MM Systems/WebApp/WebApp/Bin/Debug/WebApp.pdb
	MM Systems/WebApp/WebApp/Bin/Debug/WebApp.xap
	MM Systems/WebApp/WebApp/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	MM Systems/WebApp/WebApp/obj/Debug/Views/Resultaten.g.cs
	MM Systems/WebApp/WebApp/obj/Debug/WebApp.dll
	MM Systems/WebApp/WebApp/obj/Debug/WebApp.pdb
	MM Systems/WebApp/WebApp/obj/Debug/XapCacheFile.xml