merged more stuff

enemyview and bubbleview classes both are in the GameActivity