Powerups

Powerups should be fully functional
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	dragonfly/Hero.cpp
	dragonfly/Hero.o
	dragonfly/game