Adding and remove merchandising
Merge branch 'master' of https://github.com/tgoorden/fri3d-registration