Many changes:
Fixes so that editing term/group doesn't affect term-group relations
Merge terms fixes + new feature of autocomplete lookup for the term to merge the selected terms to (check the settings page to set the vocabulary for autocomplete)
Now also moving url_aliases for terms if any to the term we are merging to
Some other changes and fixes