0.7
Merge branch 'master' of https://github.com/duncantang/tomassa-8202365

Conflicts:
	templates/collection.liquid