Implemented mapview and registration
Resolved conflicts