improved popUp, both code and look wise
Merge branch 'develop' of http://github.com/Bergmam/DAT255 into mybranch
Merge branch 'develop' of http://github.com/Bergmam/DAT255 into mybranch
Merge branch 'develop' of http://github.com/Bergmam/DAT255 into mybranch
Merge branch 'develop' of http://github.com/Bergmam/DAT255 into mybranch
made some changes related to popUp
Merge branch 'develop' of http://github.com/Bergmam/DAT255 into mybranch

Conflicts:
	MainProject/src/se/chalmers/dat255/risk/model/Game.java
merge, various bug fixing