cena do costume
Merge branch 'master' of https://github.com/Manhazito/LMUL

Conflicts:
	BondPoint/AndroidManifest.xml
	BondPoint/bin/AndroidManifest.xml
	BondPoint/bin/BondPoint.apk
	BondPoint/bin/classes/org/feup/bondpoint/MyInfoWindowAdapter.class
	BondPoint/bin/jarlist.cache
	BondPoint/bin/resources.ap_