Implemented getLocationById and start date
Merge remote-tracking branch 'origin/master'