Some tweaks
Fixed wrong cookies
Merge branch 'dev' with save functionality

Conflicts:
	sites/all/modules/custom/de_ckan/includes/ckan.settings.admin.inc