Added powerup
Merge branch 'PowerUp' into develop0.2