Fix some JSLint warnings
Fix a syntax error & have if-conds in an own line
Merge branch 'master' into fix_jslint_kondou

Conflicts:
	apps/files/js/file-upload.js
Merge pull request #4262 from owncloud/fix_jslint_kondou

Fix some JSLint warnings