Adds location model
merge from remote
Merge branch 'master' of github.com:elfenars/bikelot