fix
Merge branch 'develop' of https://github.com/Bergmam/DAT255 into develop

Conflicts:
	MainProject/src/se/chalmers/dat255/risk/view/resource/Resource.java