changed map api key
fixed merge conflict with project.properties