Fix bug where BattleLayer is not being deallocated properly
Renamed IntroLayer to MainMenuLayer
Merge remote-tracking branch 'origin/master'

Conflicts:
	Classes/Layers/BattleLayer.m
Created battle actions locking and queue logic for the battle scene
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge from origin