update Locator
add MergeCommand
Merge commit '397b9acfb42717364d21f956d734ba0ae4fc5688' into rock/locator