Updating location to server part I
Merge branch 'master' of https://github.com/udeebsdev/AffinityMapper

Conflicts:

affinityMapper/src/main/java/com/affinitymapper/affinitymapper/model/Use
rLocation.java