Added first version of the second level Boss.
Merge branch 'master' of https://github.com/OlivierHokke/AudioGame

# By Kevin.Allain (10) and others
# Via Mick van Gelderen (4) and others
* 'master' of https://github.com/OlivierHokke/AudioGame: (26 commits)
  Fixed some settings that were for some reason not committed.... now everything should work fine
  Fixed errors
  Added audio when player collides or scathes walls
  More bugfixes due to merge...Game still doesn't run
  Fixed stuff broken by merge...
  Added MineField (with sounds, sound going faster when the player gets near a mine, dragging the player back when a mine is hit, and the story elements set)
  Implemented Oculus Rift! Need some more testing and better robustness to be sure it runs properly if no oculus is connected. Also prepared scripts for walking and stuff. Will soon create a toggle in the UI for the astoundSound plugin in game, so it can be turned on. Also a toggle in the UI should be made for oculus mode on/off. Also, I made the toggle for the blindness background a bit more simple.
  Cleaned up most warnings
  UnityVS should be local
  Finished prisonner singing room and changed story.cs in order to check quickly level 2 scripts
  working on SingPuzzleState and CharacterExplainingState
  resized prisonners singing part
  Renamed some audio files
  Cleaned up double location prefabs
  Selected the Astound library off from some prefabs. TOFIX: bug the teleporter works from the elevator to the street but from level1 portal to Level2
  Changed ElevatorState into Teleport State
  Updated location prefab
  Fixed mover
  Added minefield (random generation, no actual response to player action yet)
  Added the meta files for the prisonner singing sounds
  ...

Conflicts:
	SecondDraft/Assets/Levels.unity
	SecondDraft/Assets/Scripts/CarGeneratorScript.cs
Merge branch 'master' of https://github.com/OlivierHokke/AudioGame

# By Kevin.Allain
# Via Kevin.Allain
* 'master' of https://github.com/OlivierHokke/AudioGame:
  fixed teleportation bug from level 1 to level 2

Conflicts:
	SecondDraft/Assets/Levels.unity
Added first working version of the boss state.
Merge branch 'master' of https://github.com/OlivierHokke/AudioGame

# By Olivier Hokke
# Via Olivier Hokke
* 'master' of https://github.com/OlivierHokke/AudioGame:
  Reworked the controls system added an oculus switch

Conflicts:
	SecondDraft/Assets/Levels.unity
Merge branch 'master' of https://github.com/OlivierHokke/AudioGame

# By Mick van Gelderen
# Via Mick van Gelderen
* 'master' of https://github.com/OlivierHokke/AudioGame:
  Included wall collision and scathing