Conflicts occured during the merge.
Fixed as best as i could, authors please check (GoogleTranslateWrapperTest especially)

lib/smarty_tiki/function.query.php
lib/trackers/trackerlib.php
lib/wiki-plugins/wikiplugin_attach.php
lib/test/core/Multilingual/MachineTranslation/GoogleTranslateWrapperTest.php
styles/layout/layout.css