20140725 new json file to map

Try to merge. Error in xcode