added current location

location management
merging

merging commit
merging2

merging2
merging3

...
merging code