AddLocation scroll view scrolling almost working
Merge remote-tracking branch 'origin'