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
Merge branch 'master' of https://github.com/semvidEAFIT/infiltration-game

Conflicts:
	Unity_Project/ProjectSettings/TagManager.asset
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