Src updates
Merge branch 'master' of https://github.com/ciplogic/jHeroes2

Conflicts:
	jHeroes2/src/khlud/ciprian/jheroes2/models/game/Settings.java
	jHeroes2/src/khlud/ciprian/jheroes2/models/game/army/Army.java
	jHeroes2/src/khlud/ciprian/jheroes2/models/game/army/Troop.java
	jHeroes2/src/khlud/ciprian/jheroes2/models/game/castle/Castle.java
	jHeroes2/src/khlud/ciprian/jheroes2/models/game/heroes/Direction.java
	jHeroes2/src/khlud/ciprian/jheroes2/models/game/heroes/DirectionKinds.java
	jHeroes2/src/khlud/ciprian/jheroes2/models/game/heroes/Heroes.java
	jHeroes2/src/khlud/ciprian/jheroes2/models/game/maps/FileInfo.java
	jHeroes2/src/khlud/ciprian/jheroes2/models/game/maps/Kingdom.java
	jHeroes2/src/khlud/ciprian/jheroes2/models/game/maps/Tiles.java
	jHeroes2/src/khlud/ciprian/jheroes2/models/game/resources/Artifact.java
	jHeroes2/src/khlud/ciprian/jheroes2/models/game/spell/Spell.java
	jHeroes2/src/khlud/ciprian/jheroes2/models/game/system/Player.java
	jHeroes2/src/khlud/ciprian/jheroes2/models/game/world/World.java
	jheroes2/src/khlud/ciprian/jheroes2/models/game/army/Army.java
	jheroes2/src/khlud/ciprian/jheroes2/models/game/army/Troop.java
	jheroes2/src/khlud/ciprian/jheroes2/models/game/heroes/Direction.java
	jheroes2/src/khlud/ciprian/jheroes2/models/game/resources/Artifact.java
	jheroes2/src/khlud/ciprian/jheroes2/models/game/spell/Spell.java
	jheroes2/src/khlud/ciprian/jheroes2/models/game/system/Player.java
Tools formatter
Updates
Other fixes
Added SDL
Extras
Merge remote-tracking branch 'origin/master'

Conflicts:
	jHeroes2/src/khlud/ciprian/jheroes2/models/game/Settings.java
	jHeroes2/src/khlud/ciprian/jheroes2/models/game/army/Army.java
	jHeroes2/src/khlud/ciprian/jheroes2/models/game/army/Troop.java
	jHeroes2/src/khlud/ciprian/jheroes2/models/game/castle/Castle.java
	jHeroes2/src/khlud/ciprian/jheroes2/models/game/heroes/Direction.java
	jHeroes2/src/khlud/ciprian/jheroes2/models/game/heroes/Heroes.java
	jHeroes2/src/khlud/ciprian/jheroes2/models/game/heroes/skill/Secondary.java
	jHeroes2/src/khlud/ciprian/jheroes2/models/game/maps/FileInfo.java
	jHeroes2/src/khlud/ciprian/jheroes2/models/game/maps/Kingdom.java
	jHeroes2/src/khlud/ciprian/jheroes2/models/game/maps/Tiles.java
	jHeroes2/src/khlud/ciprian/jheroes2/models/game/maps/TilesAddon.java
	jHeroes2/src/khlud/ciprian/jheroes2/models/game/system/Player.java
	jHeroes2/src/khlud/ciprian/jheroes2/models/game/world/World.java
	jheroes2/src/khlud/ciprian/jheroes2/models/game/army/Army.java
	jheroes2/src/khlud/ciprian/jheroes2/models/game/army/Troop.java
	jheroes2/src/khlud/ciprian/jheroes2/models/game/system/Player.java
Updates