sam: added jam jar journey pages
sam: clean up
Merge remote-tracking branch 'origin/master'