Update config
Merge branch 'master' of https://github.com/dokuku/ManageDokuku

Conflicts:
	src/Dokuku.Manage.Web/web.config
Merge branch 'master' of https://github.com/dokuku/ManageDokuku

Conflicts:
	src/Dokuku.Manage.Web/web.config