Modify by Jinbo

Add border to collection page
Modify theme footer part
Modify settings.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	assets/styles.css.liquid