renaming addins
Merge remote-tracking branch 'upstream/master' into locator
Merge pull request #1491 from diegosarmentero/locator

renaming addins