Merge branch 'master' of github.com:redu/ui-components into wall

Conflicts:
	css/_footer.scss
	css/_icons.scss
	css/_scaffolding.scss
	css/_wall.scss