* add scp ant helper
* group rename-groups by normalized query/name
* fix case where query = movie object
Merge remote-tracking branch 'origin/head'