Merge branch 'master' into 'master'

Marius Cramer

2014-09-29 178258f86cdf00b9c047023b97937c794bac88ec

interface/web/tools/resync.php does not exist in tree 064d8f194f774ca570512e3e5f62d2fe7107f663