add digitalkeys
Merge origin/master

Conflicts:
	js/loadcontent.js
	lib/config/plugin.php