Restructured data
Merge remote-tracking branch 'origin/grouph-materials' into grouph-materials

Conflicts:
	www/js/controllers.js