Locationbranch

Added current location marker. Merged and switched back to my branch.