Organized Constants
Btw. The idiot, me, worked on the wrong branch...
Merge branch 'Menus'
Added generics to ArrayList initializations in Weapons and GameLayer
Merge branch 'Gameplay'

Conflicts:
	game/src/no/ntnu/folk/game/models/enums/Weapons.java
	game/src/no/ntnu/folk/game/states/GameLayer.java