Merge 6.1.beta2 into stable

Conflicts:
	CHANGELOG.md
	INSTALL.md
	documentation/FreeBSD-FreeNAS-Install.md
	documentation/INSTALL.md
	libresonic-assembly/pom.xml
	libresonic-booter/pom.xml
	libresonic-installer-debian/pom.xml
	libresonic-installer-mac/pom.xml
	libresonic-installer-rpm/pom.xml
	libresonic-installer-windows/pom.xml
	libresonic-main/pom.xml
	libresonic-rest-api/pom.xml
	libresonic-sonos-api/pom.xml
	pom.xml

libresonic-main/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.libresonic.player</groupId>
         <artifactId>libresonic</artifactId>
-        <version>6.1.rc1</version>
+        <version>6.1</version>
     </parent>
 
     <dependencies>

libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_en.properties

@@ -819,6 +819,8 @@ helppopup.playername.text = <p>Allows you to specify an easy-to-remember name fo
 helppopup.autocontrol.title = Control player automatically
 helppopup.autocontrol.text = <p>With this option selected, {0} will automatically start the player when you click "Play" \
                              in the playlist. Otherwise, you must start and connect the player yourself.</p>
+helppopup.m3ubom.title = Apply BOM in M3U file
+helppopup.m3ubom.text = <p>Apply a BOM mark in generated M3U playlists for Unicode compatibility.</p>
 helppopup.dynamicip.title = Dynamic IP address
 helppopup.dynamicip.text = <p>Turn off this option if the player uses a static IP address.</p>
 helppopup.smtpServer.title = SMTP Server