update package
Merge branch 'master' of github.com:diversen/coscms-package

Conflicts:
	config/config.ini-dist
	coslib/cosMail.php
	coslib/shell/install.inc
	coslib/strings/normalize.php
	modules/blog/module.php
	modules/content/admin/module.php
	modules/content/article/views.php
	templates/openid-selector/lang/da_DK/language.inc