Merge branch 'pixcept/ispconfig3-mods-new-layout-3.1'

Marius Cramer

2015-01-08 3b0546fc2539df441819dbf05d679d349c62267a

interface/web/js/jquery.combobox.js does not exist in tree 91037f9907158700252a5f334ba06958f9c0e63e