Implemented  top and bottom collision border
Score is displayed and travel points added as we swim.
Updated ExtendedSprite
Merge branch 'master' into score

Conflicts:
	src/no/ntnu/flapmyfish/screens/GameScreen.java
Merge branch 'master' of https://github.com/torgeha/FlapMyFish into tjBranch
Merge pull request #11 from torgeha/tjBranch

Tj branch
Merge branch 'master' of github.com:torgeha/FlapMyFish into audun_branch
Added support for XXHDPI screens
Merge branch 'master' of github.com:torgeha/FlapMyFish into audun_branch
Highscore is saved when beaten. Highscore is loaded at startup and saved on pause.
Merge pull request #12 from torgeha/score

Highscore is saved when beaten. Highscore is loaded at startup and saved...
Fixed collision and onPause bug
Fixed more level-stuff
fixed merge conflict in mainactivity