FilePath for FileUploader
Merge remote-tracking branch 'origin/master'

Conflicts:
	sks-web/src/main/webapp/layouts/header.xhtml