Merge branch 'master' of https://github.com/semvidEAFIT/infiltration-game

Conflicts:
	Unity_Project/Assets/scripts/src/ctrl/Level.cs
	Unity_Project/ProjectSettings/TagManager.asset
Merge branch 'master' of https://github.com/semvidEAFIT/infiltration-game
Whatevs
Merge branch 'master' of https://github.com/semvidEAFIT/infiltration-game
Almost fix 210
Merge branch 'pathfinding' of https://github.com/semvidEAFIT/infiltration-game
Fix #210 entre mateoc y castillobg
Merge branch 'master' of https://github.com/semvidEAFIT/infiltration-game

Conflicts:
	Unity_Project/Assets/Prefabs/FireTeam/FireTeam 1.prefab
	Unity_Project/Assets/Prefabs/Soldier.prefab
	Unity_Project/Assets/Resources/fragGrenade.prefab
	Unity_Project/Assets/scenes/tests/All test.unity
	Unity_Project/Assets/scripts/src/characters/soldiers/Soldier.cs
	Unity_Project/Assets/scripts/src/pathfinding/Grid.cs
	Unity_Project/Assets/scripts/src/props/weapons/grenades/Grenade.cs
Changes in gunstate #210
Merge branch 'master' of https://github.com/semvidEAFIT/infiltration-game

Conflicts:
	Unity_Project/ProjectSettings/TagManager.asset
Changed the scale of the sprites and redesigned base scene
merge from semvid repo
fix #104 fix #105 fix #235
Merge branch 'master' of https://github.com/semvidEAFIT/infiltration-game

Conflicts:
	Unity_Project/Assets/Materials/props.meta
	Unity_Project/Assets/Prefabs/Enemy/Terrorist.prefab
	Unity_Project/Assets/Prefabs/FireTeam/FireTeam 1.prefab
	Unity_Project/Assets/Prefabs/Soldier.prefab
	Unity_Project/Assets/Prefabs/meshes.meta
	Unity_Project/Assets/scenes/tests/AItest.unity.meta
Player control
Merge from master
Setup
Started designing level5 and updated some textures
Merge branch 'master' of https://github.com/semvidEAFIT/infiltration-game
Merge branch 'master' of https://github.com/semvidEAFIT/infiltration-game into control