Merge branch 'master' into dev
Merge branch 'dev' of https://github.com/xysmas/lamegame into dev
menu implemented with serverclient
menu with planet
real menu added
random meteors on the menu, working help/credits
Better physics, more bouncy/hard mode, less bouncy normal mode
Merge branch 'dev' into better_menu

Conflicts:
	src/engineTester/MainLoopClient.java
Merge branch 'better_menu' of github.com:xysmas/lamegame into better_menu

Conflicts:
	src/engineTester/MainLoopClient.java
Better Icons. Audio
merge with more recent master
Update entity some, more modes
new Box
Merge remote-tracking branch 'origin/crystals' into dev

Conflicts:
	src/engineTester/MainLoopClient.java
Merge remote-tracking branch 'origin/crystals' into dev
Merge skybox
Merge branch 'dev' into game_mechanics
Remove prints
Merge audio
Collect all the crystals