daily
Merge branch 'master' of https://github.com/azufr/plugins

Conflicts:
	themes/demo-theme/docroot/css/.sass-cache/extras.css