Added powerup timers depending on the powerup type
Merge branch 'powerup_timer' into development