trololo
dwad
Merge branch 'master' of https://github.com/KostiantynKopytov/Cement

Conflicts:
	concrete/core/directives/widget.directive.js