re #750 - Avoid empty class property
Merge branch 'master' into feature/750-results

Conflicts:
	application/admin/component/traffic/view/article/templates/default_sidebar.html.php
	application/site/component/traffic/view/article/templates/default.html.php
Merge branch 'feature/750-results' into staging

Conflicts:
	application/admin/component/traffic/view/article/templates/default_sidebar.html.php