Changes in .sln configuration
Merge remote-tracking branch 'refs/remotes/origin/jsrc1115' into OscarRPR

Conflicts:
	Library/expandedItems
	SR_PC-csharp.sln
	SR_PC.sln
Alpha test of th Input Manager for Android controller
1. Movement in android with joystick thumb
2. Creation of Joystick prefab which existed in a Unity tutorial
3. General implementation of Input Manager for multiple types of controller
Input Manager PC, Xbox360 and Android Beta
1. Added support for Xbox360 controller with some bugs in the keys (WIP)
2. Added full support to android controller (Walk, run, jump, attack, special attack)
3. Added functionality of check for shakes in case of special attacks
4. Added methods for maintaing relative position and size of the screen buttons in Android
5. Creation of GUI methods for build UI in game.
6. Added icons for the temporal buttons
Merge with jsrc1115 and fixed some bugs
fixing last commit
Merge remote-tracking branch 'refs/remotes/origin/OscarRPR' into jsrc1115

Conflicts:
	Assets/Prefabs/Player.prefab
	Assets/Scenes/Lvl1.unity
	Assets/Scripts/BattleArena/CameraCustom.cs
	Assets/Scripts/BattleArena/SceneManager.cs
	Library/AssetServerCacheV3
	Library/EditorUserBuildSettings.asset
	Library/InspectorExpandedItems.asset
	Library/expandedItems
	Library/guidmapper
	SR_PC-csharp.sln
	SR_PC.sln