Merge remote-tracking branch 'dd/master'

Res. Conflicts:
	js/custom.js