* refactored + extended + bug fix
* misc
Merge branch 'develop' into feature/extend-enemies
* bug fix (waves on the same time)