release version of maps and wallet
project.properties merge conflict