Merge pull request #45 from martinqt/dev

Update
Merge pull request #51 from martinqt/dev

Update
Merge pull request #52 from martinqt/dev

Update
Merge pull request #53 from martinqt/dev

Update
Orphan comma
Merge pull request #55 from martinqt/dev

Update
Merge branch 'master' into dev

Conflicts:
	Src/Entity/Manager/LocationManager.py