Sync with diff on server box

aka Light's fixes
Merge pull request #175 from ProjectSWGCore/Treeku

Treeku
Merge remote-tracking branch 'origin/master' into Release

Conflicts:
	src/resources/objects/tangible/TangibleObject.java
	src/services/ConnectionService.java
	src/services/PlayerService.java
	src/services/SimulationService.java
	src/services/object/ObjectService.java
Merge remote-tracking branch 'origin/master' into Release

Conflicts:
	src/services/PlayerService.java
	src/services/SimulationService.java
Merge remote-tracking branch 'origin/master' into Release
Merge pull request #603 from ProjectSWGCore/master

Release Merge
Merge branch 'Release' into experimental

Conflicts:
	src/main/NGECore.java
Fixed merge conflict
Merge branch 'master' into experimental
Merge branch 'experimental' of https://github.com/projectswgcore/ngecore2 into experimental