Added a basic server layer, and location tracking model object
Merge remote-tracking branch 'origin/master'