Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Scripts/Managers/ButtonManager.cs

button sounds and settings button in level1
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Scripts/Managers/ButtonManager.cs
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Scripts/Managers/ButtonManager.cs