Merge branch 'master' into develop

.github/ISSUE_TEMPLATE/bug_report.md

@@ -33,8 +33,6 @@ assignees: ''
 <!-- Please replace the underscores with your answer. Do not remove the '*' characters. -->
  - OS: **________**
  - Java version: **________**
- - Server software: **________** <!-- Available options: SPIGOT, PAPER, TACO -->
- - Minecraft server version: **________** <!-- E.g.: 1.13.1, 1.13.2, 1.14... -->
 
 #### Plugins
 <!-- /!\ Leaving this section blank will result in your ticket being closed without further explanation. -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -2,7 +2,7 @@
 name: Feature request
 about: Suggest an idea to improve BentoBox
 title: ''
-labels: 'Type: Enhancement, Status: Pending, Priority: Low'
+labels: 'Priority: Low, Status: Pending, Type: Enhancement'
 assignees: ''
 
 ---