correction bug + ajout animation
Merge branch 'beta' of https://github.com/Malth/ProjetKotapak into beta

Conflicts:
	Unity/Assets/Scripts/ModifyTextFieldScript.cs
	Unity/Library/EditorUserBuildSettings.asset
	Unity/Library/InspectorExpandedItems.asset
	Unity/Library/assetDatabase3
	Unity/Library/guidmapper
	Unity/Library/metadata/05/05f5d58ff6e35964f829e767552b0c0d
	Unity/Library/metadata/70/7086f1bd09654584c921b87501262c5a
	Unity/Library/metadata/c5/c5ab2b3bda5948741afe306d7bd147cf
	Unity/Unity-csharp.sln
	Unity/Unity.sln
	Unity/Unity.userprefs