Add serialization of locations. Add locations save onSaveInstanceState.
Add spinner on ActionBar to change layers