Merge branch 'v2.0-dev' into v2.0-legend

Conflicts:
	src/controllers/controller.doughnut.js