Merge branch 'quality_assurance' of https://bitbucket.org/projectswg/holocore into quality_assurance Conflicts: pom.xml scripts/commands/generic/cmdBroadcast.js scripts/commands/generic/cmdBroadcastArea.js scripts/commands/generic/cmdBroadcastGalaxy.