no need for a dedicated examples task
Merge branch 'master' into sub-packages

Conflicts:
	Gruntfile.js