* added types
* bug fix on waves
Merge branch 'develop' into feature/extend-enemies