added new enemy type
Merge branch 'mergeBranch'
huge last minute interface rework with Danny