fix recognizing bmp files
formating
Added support for Sorenson video codec

This codec is used in flv video files
Revert "Added support for Sorenson video codec"

This reverts commit 39157f4223cfc8949c22e5014e53d876819cdf6e.
Revert "Revert "Added support for Sorenson video codec""

This reverts commit 8820718a447c547254c4e84adafae81fcd1fe147.
Revert "fix recognizing bmp files"

This reverts commit 4d49ca30870cfbf37a35f712bcc4f489a870dded.

Conflicts:
	src/main/java/net/pms/formats/FormatFactory.java
Revert "Revert "Revert "Added support for Sorenson video codec"""

This reverts commit 94ae0604ca522670d5028c9a4ddf3d48cb7b4109.
Fixed support for BMP
Added support for Sorenson video codec

This codec is used in flv video files
Revert "Fixed support for BMP"

This reverts commit 024fb360f330aa17454d254869f75cb21b580bb1.
Revert "Revert "Fixed support for BMP""

This reverts commit 2418b0c967b482d0080bcf631b5e0724c7d8d854.
Merge pull request #442 from ler0y/BMPSupport

Fix recognizing BMP files
Merge pull request #443 from ler0y/SorensonVideoSupport

Sorenson Media support
Shortened "sorenson" to "sor" for renderer configs
Formatting
Merge branch 'master' of github.com:UniversalMediaServer/UniversalMediaServer into 5.0.0
Added option to disable sending folder thumbnails in renderer configs
Finished SendFolderThumbnails
Disabled sending folder thumbnails on Sony Bravia W series TVs because it causes " | JPG" to be appended to all folder names
Merge branch 'master' of github.com:UniversalMediaServer/UniversalMediaServer into 5.0.0

Conflicts:
	src/main/java/net/pms/configuration/RendererConfiguration.java