Added phase 1 of localization.
Merged with origin/sprint4.