moved location_id to link table

This is for my task - https://www.google-melange.com/gci/task/view/google/gci2014/5842417454415872
) is a bit out of place ;)