add location.js, images
merge