Merge branch 'CORE-245-safety-deposit' of https://bitbucket.org/M4SS/holocore into quality_assurance Conflicts: src/services/player/CharacterCreationService.java