Mage
EnemyA
EnemyB
Shadow
Merge branch 'feature/MageAndEnemies' into develop

* feature/MageAndEnemies:
  Mage EnemyA EnemyB Shadow
Merge branch 'develop' into feature/waves-2-0