commit
commit
commit
commit
commit
Merge branch 'master' of https://git@github.com/Jmballes/DH.git

Conflicts:
	bin/classes.dex
	bin/res/drawable/fondo.png
	bin/res/drawable/uah_icon.png
	bin/resources.ap_
	src/com/draw/MultiDrawable.java