Optionen + ASPNET DB
Merge remote-tracking branch 'origin/master'

Conflicts:
	Verplaner/Options.aspx.cs
	Verplaner/Options.aspx.designer.cs
	Verplaner/Web.config