trying to coonect popup to model
some large changes as well as minor fixes regarding popUps
added comment
Merge branch 'develop' into mybranch

Conflicts:
	MainProject/src/se/chalmers/dat255/risk/model/Game.java
popUp for attack works, for multiple attacks just press second province again