merge from oron
merge commin
merge
Merge branch 'develop' of https://github.com/Conduit-Marketing/Projects into develop

Conflicts:
	conduit-earth-globe/stamp.txt