Fix for symbolic links: File.getCanonicalPath() returns the full path (so the expanded symbolic link). This gave problems retrieving media files: isRequestedFileInPath checked for the start of the can. path.
Merge branch 'master' into deploy/vru

Conflicts:
	src/main/webapp/META-INF/context.xml