updated tests and team class
Merge branch 'dev' of http://github.com/ijoshftw/ufm-reckoning into dev

Conflicts:
	src/main/java/nl/joshuaslik/UFMReckoning/App.java
	src/test/java/nl/joshuaslik/UFMReckoning/backend/FieldplayerTest.java
	src/test/java/nl/joshuaslik/UFMReckoning/backend/GoalkeeperTest.java
	src/test/java/nl/joshuaslik/UFMReckoning/backend/TeamTest.java
Solved a lot of merge conflicts that accidently managed to get committed unsolved
Merge branch 'dev' into ft-MoreTests