Fix for Multiple Cross Site Scripting vulnerabilities #548, encode userid and uid.
Fixes Multiple Cross Site Scripting vulnerabilities #548, encode postman messages.
Remove file upload as a valid metadatafield type, fixes #547 and fixes #544
Merge pull request #550 from janus-ssp/bugfix/xss

[REVIEW] Cross Site Scripting fixes
Merge pull request #549 from janus-ssp/bugfix/remove-file-upload-functionality

[REVIEW] Remove file upload as a valid metadatafield type
Revert "Refactor SspVoter to make code more readable introduce getAllowedRoles private method."

This reverts commit e6c08c0142d927a0d23da1d33970665f62aa6c44.
Merge branch 'develop' into bugfix/540-clickjacking-protection

Conflicts:
	www/previewfile.php