dfg
Merge branch 'master' of https://github.com/sixtythreebits/ddb

Conflicts:
	DDB/Areas/Administration/Content/js/js.js
with ajax