Committing before push
Merge branch 'master' of https://github.com/BonsaiMediaGroup/sherpaHome

Conflicts:
	app/src/views/TestView.js
	app/src/widgets/WorldScroll.js
Committing before pull.
Committing changes before pushing.
Merge branch 'master' of https://github.com/BonsaiMediaGroup/sherpaHome
Committing work for ProductCollectionView.js.