Merge branch 'master' into 'master'

Marius Cramer

2015-02-15 427cd2f62e87fc13fee43ecf764418c7ca5ae520

interface/web/tools/resync_do.php does not exist in tree 3e868d8af619ff6480a33ff6b1e88136ac701470