Code freeze. Before custom-location
Added support for custom location in StartActivity