Added Twitter features
Merged Locators