Merge remote-tracking branch 'refs/remotes/origin/jsrc1115'
Fixed Some Library Definitions
Merge remote-tracking branch 'refs/remotes/origin/jsrc1115' into OscarRPR

Conflicts:
	Library/guidmapper
	SR_PC-csharp.sln
	SR_PC.sln
Implemented Custom InputManager
1. The controllers for the two players are now separated
2. Each controller configuration (there are 4, two keyboards, two gamepads) can be changed in the inspector of the SceneManager.
3. Uses KeyCode for faster compile time in each field.
4. The axis for the movement are defined in the project settings for easy handling.
5. Controllers are not working right (Alpha phase)
6. Id's for the controllers are Keyboard1, Keyboard2, Controller1, Controller2
Added some simple particle effects, changed states for the player fsm and fixed one of the reported bugs.
Merge remote-tracking branch 'refs/remotes/origin/OscarRPR' into jsrc1115

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assets/Prefabs/Player.prefab
	Assets/Scripts/BattleArena/Player/Player.cs
	Library/InspectorExpandedItems.asset
	Library/guidmapper
	SR_PC-csharp.sln
	SR_PC.sln
Merged with Oscar's REP