Merge branch 'master' of github.com:RyanThompson/Facets

Conflicts:
	app/addons/themes/streams/views/partials/aside.php
	public/css/app.css
	public/src/less/app/aside.less
Merge branch 'master' of github.com:RyanThompson/Facets

Conflicts:
	public/css/app.css
	public/src/less/app/aside.less