MediaMonitor
Merge branch 'master', remote branch 'origin' into new_media
Merge branch 'master' into 7z
Merge branch '7z' into new_media
Monitor + last played
More media + use of reflection
Bug fix
Merge branch 'master' of github.com:UniversalMediaServer/UniversalMediaServer into new_media

Conflicts:
	src/main/java/net/pms/configuration/PmsConfiguration.java
Fix external installer to find new jars automatically
Merge branch 'master' of github.com:UniversalMediaServer/UniversalMediaServer into new_media

Conflicts:
	src/main/java/net/pms/configuration/DownloadPlugins.java
	src/main/java/net/pms/dlna/RootFolder.java
Revert 2a1d0d5

It's in the wrong branch and screwed up line endings
Undo the last revert since it was added to the core anyway
Merge branch 'master' of github.com:UniversalMediaServer/UniversalMediaServer into new_media
Formatting
Use StringBuilder instead of StringBuffer & formatting
Merge branch 'master' of github.com:UniversalMediaServer/UniversalMediaServer into new_media

Conflicts:
	src/main/java/net/pms/configuration/PmsConfiguration.java
	src/main/java/net/pms/dlna/DLNAResource.java
Merge branch 'master' of github.com:UniversalMediaServer/UniversalMediaServer into new_media

Conflicts:
	src/main/java/net/pms/configuration/PmsConfiguration.java
	src/main/java/net/pms/dlna/DLNAResource.java
	src/main/java/net/pms/dlna/RealFile.java
Formatting
Merge branch 'master' of github.com:UniversalMediaServer/UniversalMediaServer into new_media
Formatting