Merge pull request #1 from sorsergios/master

corrigo scenario y pencil
change new scene grid
Merge pull request #2 from sorsergios/master

Borrado de trazo funcionando
Select an image and set on the scenario
Cambios al seleccionar un elemento de la grilla de imagenes
Merge branch 'master' of https://github.com/alestarss/talker-android

Conflicts:
	project.properties
	src/ar/fi/uba/androidtalker/CanvasActivity.java
	src/ar/uba/fi/talker/view/Scenario.java