Merge sucessfull

Problem with toolbar in addlocationactivity