Merge pull request #34 from samsruti/master

Merged changes from @samsruti for task http://www.google-melange.com/gci/task/view/google/gci2014/6057186773958656
Created a Link Table
Merge pull request #33 from anurag-ks/anurag_staging

Merging from @anurag-ks for GCI task https://www.google-melange.com/gci/task/view/google/gci2014/6380382056349696
todo task for gci
deployment setting todo task