Merge branch 'develop'

* develop:
  changes
  settings
  TETextfield
  updated git.properties

Conflicts:
	.gitignore
	src/main/java/de/spareripsproduction/madn/client/Game.java
	src/main/java/de/spareripsproduction/madn/client/scene/GameScene.java
	src/main/java/de/spareripsproduction/madn/client/scene/Scene.java
jo
Merge branch 'develop' of https://github.com/SpareRips-Productions/Mensch-aergere-dich-nicht into develop
foooo
Merge branch 'develop' of https://github.com/SpareRips-Productions/Mensch-aergere-dich-nicht into develop

# By Bluespide
# Via Bluespide
* 'develop' of https://github.com/SpareRips-Productions/Mensch-aergere-dich-nicht:
  jo

Conflicts:
	src/main/java/de/spareripsproduction/madn/client/logic/Player.java
GameFirgure Render
Player
Merge branch 'develop' of https://github.com/SpareRips-Productions/Mensch-aergere-dich-nicht into develop
Border and Hover for Figure
Player5
Merge branch 'develop' of https://github.com/SpareRips-Productions/Mensch-aergere-dich-nicht into develop
Jap
Center Board
Merge branch 'develop' of https://github.com/SpareRips-Productions/Mensch-aergere-dich-nicht into develop

# By Bluespide
# Via Bluespide
* 'develop' of https://github.com/SpareRips-Productions/Mensch-aergere-dich-nicht:
  Jap
  Player5
  Player
Foo
FIXED: Font Bug on Windows
NEW: Font Droid Snas for UI
Raccoon Update
Fixed more bugs, Credits
Merge branch 'master' of https://github.com/SpareRips-Productions/Mensch-aergere-dich-nicht

# By Thomas Hampe (11) and others
# Via Bluespide (5) and others
* 'master' of https://github.com/SpareRips-Productions/Mensch-aergere-dich-nicht: (24 commits)
  no message
  Dice
  Jo
  Gamefigures and Dice
  Enter zum bestaetigen der Textfeld Eingabe
  Revert "Game Figures"
  Enter zum bestaetigen der Textfeld Eingabe
  Game Figures
  SoundManager
  no message
  some
  RenderAndUpdateable -> Graphics2D
  Board drawing
  Board
  SpawnField
  Field
  no message
  label fix
  äh
  Graphics
  ...

Conflicts:
	.gitignore
	src/main/java/de/spareripsproduction/madn/client/Game.java
	src/main/java/de/spareripsproduction/madn/client/scene/GameScene.java
	src/main/java/de/spareripsproduction/madn/client/scene/Scene.java
Merge branch 'release/1.0.0'