Add button
Merge remote-tracking branch 'origin/master' into Add_Button
Add third view
Merge remote-tracking branch 'origin/Map_Brand' into Add_Button
edit thirdviewcontroller