Update settings.php

fixed overlap of input controls (root cert import)
see issue: https://github.com/owncloud/apps/issues/767
Merge remote-tracking branch 'upstream/master'

Conflicts:
	apps/files_external/templates/settings.php
Merge pull request #2360 from sherbrecher/master

files_external: fix for overlap if input controls