Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3

Florian Schaal

2015-01-08 2e9ac915cb0efc7474443d317e317d9875a1feef

interface/web/js/jquery.combobox.js does not exist in tree 0f1fb35faa0aaf54dd3e5dc1b7b4d9a407093996