Merge branch 'master' into resume_fix
Formatting
Merge branch 'resume_fix' of github.com:UniversalMediaServer/UniversalMediaServer into resume_fix
Sync
Updated changelog
Updated changelog
Updated changelog
Updated changelog
Enabled automatic updating to 2.6.4 on Windows
Make sure it is possible to override thumbnails
Merge branch 'master' of github.com:UniversalMediaServer/UniversalMediaServer
Set FFmpeg AR
Merge branch 'master' of github.com:UniversalMediaServer/UniversalMediaServer into resume_fix

Conflicts:
	src/main/java/net/pms/dlna/DLNAResource.java
Revert Commit fbb659f