tEST
A lot of things to commit
Merge branch 'master' into Test2

Conflicts:
	Library/AnnotationManager
	Library/BuildSettings.asset
	Library/CurrentLayout.dwlt
	Library/EditorUserBuildSettings.asset
	Library/EditorUserSettings.asset
	Library/InspectorExpandedItems.asset
	Library/MonoManager.asset
	Library/ProjectSettings.asset
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/00/00000000000000001000000000000000
	ProjectSettings/AudioManager.asset
	ProjectSettings/DynamicsManager.asset
	ProjectSettings/EditorBuildSettings.asset
	ProjectSettings/EditorSettings.asset
	ProjectSettings/GraphicsSettings.asset
	ProjectSettings/InputManager.asset
	ProjectSettings/NavMeshLayers.asset
	ProjectSettings/NetworkManager.asset
	ProjectSettings/Physics2DSettings.asset
	ProjectSettings/ProjectSettings.asset
	ProjectSettings/QualitySettings.asset
	ProjectSettings/TagManager.asset
	ProjectSettings/TimeManager.asset