Fix issue with image padding when brand in navbar
Rename _footer-columns to footer-column-loop
Merge branch 'master' into chateauboutique

Conflicts:
	Bootstrapify.zip