added a new powerup, energy topedo
Merge branch 'dev_AO' into dev