updated the hooks, implemented fish form, and added a fishFormPowerUp
Merge branch 'origin/master'

Conflicts:
	deep-blue/bin/com/me/screens/GameScreen.class