Setup the New Code directory
Merge branch 'Communication'

Conflicts:
	.gitignore
Merge branch 'master' into Inventory
Cleanup