just like this.
Merge branch 'master' of https://github.com/getshop/applications

Conflicts:
	apps/ProductManager/template/attributes.phtml
completed filtering attributes list.