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

Conflicts:
	layouttpl/demo-2column-layouttpl/docroot/demo_2column.tpl
	themes/demo-theme/docroot/_diffs/templates/portal_normal.vm
	themes/demo-theme/docroot/css/.sass-cache/main.css
	themes/demo-theme/docroot/templates/portal_normal.vm