can't  remember what changed :)
Merge branch 'master' of github.com:danlr/BouncingBalls

Conflicts:
	AndroidManifest.xml
	res/menu/game_menu.xml
	res/values/strings.xml
	src/com/anod/bouncingballs/GameView.java
	src/com/anod/bouncingballs/MainActivity.java
	src/com/anod/bouncingballs/model/Ball.java
	src/com/anod/bouncingballs/model/Box.java