Removed unused files
Fixed build
Merge remote-tracking branch 'upstream/master' into translation
update translation