Merge branch 'quality_assurance' of https://bitbucket.org/projectswg/holocore into quality_assurance Conflicts: src/resources/objects/tangible/TangibleObject.java src/services/commands/CommandService.java src/services/galaxy/GameManager.java src/serv