simplified Location code and made sharedLocation work, made addLocation screen appear when clicked in tableview
Merge remote-tracking branch 'origin/master'