Merge with master
Formatting
Merge branch 'master' of github.com:UniversalMediaServer/UniversalMediaServer into web

Conflicts:
	src/main/assembly/assembly-linux.xml
	src/main/assembly/assembly-osx.xml
	src/main/java/net/pms/configuration/PmsConfiguration.java
	src/main/java/net/pms/encoders/FFMpegVideo.java
	src/main/resources/i18n/messages.properties
Merge branch 'master' of github.com:UniversalMediaServer/UniversalMediaServer into web
Formatting
Formatting
Formatting
Fixed front page display
Replaced browser logos
Deleted old CSS file and updated new one
Added padding to browser logos
Made browsers display like renderers
Added setting to toggle web authentication
Display username in renderer name if auth is enabled