cards changed
try
locale commit
added setFieldAtIndex in playfield for testing purpose
last commit
push
local commit
class Imonopolycards no longer used
local commit
g
Merge branch 'master' of https://github.com/T1m1/de.htwg.se.monopoly.git

Conflicts:
	HtwgMonopoly/src/de/htwg/monopoly/controller/impl/Playfield.java
	HtwgMonopoly/src/de/htwg/monopoly/util/IMonopolyUtil.java
	HtwgMonopoly/src/de/htwg/monopoly/view/FieldDrawPanel.java
	HtwgMonopoly/src/de/htwg/monopoly/view/GraphicUserInterface.java
	HtwgMonopoly/src/de/htwg/monopoly/view/components/Position.java
	HtwgMonopoly/test/de/htwg/monopoly/entities/PlayfieldTest.java