delete row activities working
Merge branch 'origin/master'

Conflicts:
	MM Systems/PanoramaApp3/PanoramaApp3.v11.suo
	MM Systems/PanoramaApp3/Wcf.Azure2/bin/Release/app.publish/Wcf.Azure2.cspkg
	MM Systems/PanoramaApp3/Wcf.Azure2/csx/Release/ServiceDefinition.rd
	MM Systems/PanoramaApp3/Wcf.Azure2/csx/Release/roles/Wcf/approot/bin/Wcf.dll
	MM Systems/PanoramaApp3/Wcf.Azure2/obj/Release/Wcf/bin/Wcf.dll
	MM Systems/PanoramaApp3/WcfService/Wcf/bin/Wcf.dll
	MM Systems/PanoramaApp3/WcfService/Wcf/bin/Wcf.pdb
	MM Systems/PanoramaApp3/WcfService/Wcf/obj/Release/Wcf.dll
	MM Systems/PanoramaApp3/WcfService/Wcf/obj/Release/Wcf.pdb
	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/DialogBoxes/AddCategory.g.cs
	MM Systems/WebApp/WebApp/obj/Debug/DialogBoxes/AddCategory.g.i.cs
	MM Systems/WebApp/WebApp/obj/Debug/Views/Activiteiten.g.cs
	MM Systems/WebApp/WebApp/obj/Debug/WebApp.csproj.FileListAbsolute.txt
	MM Systems/WebApp/WebApp/obj/Debug/WebApp.csprojResolveAssemblyReference.cache
	MM Systems/WebApp/WebApp/obj/Debug/WebApp.dll
	MM Systems/WebApp/WebApp/obj/Debug/WebApp.pdb
	MM Systems/WebApp/WebApp/obj/Debug/XapCacheFile.xml