PreGameMenu

...
PreGameMenu update

updated class and Constants
Fixed minor error in PreGameMenu

PlayerCount update
Merging menus branch

Conflicts:
	game/src/no/ntnu/folk/game/Constants.java
	game/src/no/ntnu/folk/game/states/menus/PreGameMenu.java
added lost options in merge
Added JavaDoc to PreGameMenu
added lost constants lost in merge
Merge branch 'Menus' of ssh://git@github.com/Daveiac/AndroidGameProject.git into Menus
PreGameMenu minor update
Renamed levels to raw
Merge remote-tracking branch 'origin/Menus'