Added location model
enabled the sending of locations
Merged the master branch
Merge branch 'master' into feature/location-support
Completed the location support
Merge branch 'feature/location-support' into develop