(#7) css_merger: Fixed theme processing of widgets and controls
(#7) changelog

Conflicts:
	CHANGELOG.md
Merge branch 'feature-0.3.x/7-fix-themed-widgets' into release-0.3.x

* feature-0.3.x/7-fix-themed-widgets:
  (#7) changelog
  (#7) css_merger: Fixed theme processing of widgets and controls