fixed merging bug
updated language files for new features
version updated