nada mudado. mas isto diz que sim x)
Merge branch 'master' of https://github.com/Manhazito/LMUL

Conflicts:
	BondPoint/AndroidManifest.xml
	BondPoint/bin/AndroidManifest.xml
	BondPoint/bin/BondPoint.apk
	BondPoint/bin/classes.dex