whitespace and indentation fixes
fix ESC for conflicts dialog
Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core into fix_3728_with_file_exists_dialog