Merge branch 'master' into commonDB

# Conflicts:
#	CommonCore

CommonCore

@@ -1 +1 @@
-Subproject commit c9b4dad9b9a730eb70e1a843d78e03e5b0441c7c
+Subproject commit 3da8d04f3565cb99a417405284bca0efaaf9c5a3

SpigotCore_Main/src/SpigotCore.properties

@@ -98,4 +98,4 @@ NOSCHEMSUBMITTING_TEAM={0} §e{1} §7was excluded from §e{2} {3} §7from §e§l
 NOSCHEMSUBMITTING_PERMA=§7You are §epermanently§7 excluded from submitting §e§lschematics§8: §e{0}
 NOSCHEMSUBMITTING_UNTIL=§7You are excluded from submitting §e§lschematics §euntil {0}§8: §e{1}
 UNNOSCHEMSUBMITTING_ERROR=§cThe player is not excluded from submitting schematics.
-UNNOSCHEMSUBMITTING=§e{0} §7may now submit §e§lschematics§7 again§8.
+UNNOSCHEMSUBMITTING=§e{0} §7may now submit §e§lschematics§7 again§8.