Merge branch 'master' into 'master'

Marius Cramer

2014-10-13 559b657f9fc6a5374de9b7b1caf20abd4e308d76

interface/web/js/jquery-1.6.3.min.js does not exist in tree 1cce8dbd36174d6689ab240d1a6bf4a00600898b