Merge pull request #19 from paulhyunkim/tsangbranch

DS-store changes, resolved conflicts
changed json endpoints, working on updating user location
ready to merge
Merge branch 'master' into stylebranch
Merge pull request #20 from paulhyunkim/stylebranch

Stylebranch
layout changes
layout changes, endpoints