moved location_id to link table
Merge pull request #40 from anurag-ks/anurag_staging

moved location_id to link table