model map
Merge origin/master

Conflicts:
	exiastore/src/view/catalogue.php