cambios en R
Merge branch 'master' into GameBase

Conflicts:
	bin/classes/bott/app/game_2048_droid/R$drawable.class
	bin/classes/bott/app/game_2048_droid/R$id.class
	bin/classes/bott/app/game_2048_droid/R$layout.class
	bin/classes/bott/app/game_2048_droid/R$menu.class
	bin/classes/bott/app/game_2048_droid/R$string.class
	bin/classes/bott/app/game_2048_droid/R$style.class
	gen/bott/app/game_2048_droid/R.java