Added code for Cancel and Save buttons in AddLocationViewController
Merge remote-tracking branch 'origin'
Merge remote-tracking branch 'origin'