Background y mapas
Merge origin/master
properties a jdk 1.7