Fix styling issues

Fix issues on general settings page which raised up after refactoring
tabs
Merge remote-tracking branch 'nikola/master'

Conflicts:
	app/scripts/superdesk/settings/views/main.html