Merge branch 'Atlas'

Conflicts:
	Library/InspectorExpandedItems.asset
	ProjectSettings/DynamicsManager.asset
Swapping Added
merge swiping into Atlas brench