animation
some small tweaks
Merge branch 'master' of https://github.com/Noeyfan/Working

Conflicts:
	PsychoKiller/Assets/Materials/01 - Default.mat
	PsychoKiller/Assets/Scenes/MainScene.unity
	PsychoKiller/Assets/Scripts/DoorController.cs
	PsychoKiller/ProjectSettings/ProjectSettings.asset
	PsychoKiller/ProjectSettings/QualitySettings.asset
	PsychoKiller/ProjectSettings/TagManager.asset
initial animation integration