articles
variation filtering + attribute value grouping
bug fix
small items
reset password
Merge remote-tracking branch 'origin/master'

Conflicts:
	grails-app/views/producingProduct/_form.gsp
Merge remote-tracking branch 'origin/master'

Conflicts:
	grails-app/views/producingProduct/_form.gsp
Merge remote-tracking branch 'origin/master'

Conflicts:
	grails-app/views/producingProduct/_form.gsp