Merge branch 'master' into 21

Conflicts:
	Gruntfile.js
	app/pages-list/index.html
Merge branch '21' of https://github.com/Gizra/CDL into 21