Merge branch 'master' into scripting

Conflicts:
	codeblocks/d2k.cbp
	codeblocks/d2k.depend
	codeblocks/d2k.layout
Update Code::Blocks projects
Merge branch 'master' into scripting
Merge branch 'console' into scripting