Password veranderen
begin admincontrol
Merge remote-tracking branch 'origin/master'

Conflicts:
	PastaPot.v12.suo
	PastaPot/App_Data/PastaPotContext-20141122102058.mdf
	PastaPot/App_Data/PastaPotContext-20141122102058_log.ldf
	PastaPot/Views/Shared/_Layout.cshtml
	PastaPot/bin/PastaPot.dll
	PastaPot/bin/PastaPot.pdb
	PastaPot/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	PastaPot/obj/Debug/PastaPot.dll
	PastaPot/obj/Debug/PastaPot.pdb