Alteracao para 2 butoes
Merge branch 'master' of https://github.com/Manhazito/LMUL

Conflicts:
	BondPoint/bin/R.txt
	BondPoint/bin/classes/com/facebook/android/R$id.class
	BondPoint/bin/classes/org/feup/bondpoint/ConnectActivity$1.class
	BondPoint/bin/classes/org/feup/bondpoint/ConnectActivity$2.class
	BondPoint/bin/classes/org/feup/bondpoint/ConnectActivity$3.class
	BondPoint/bin/classes/org/feup/bondpoint/ConnectActivity$4.class
	BondPoint/bin/classes/org/feup/bondpoint/ConnectActivity.class
	BondPoint/bin/classes/org/feup/bondpoint/Map.class
	BondPoint/bin/classes/org/feup/bondpoint/MyInfoWindowAdapter.class
	BondPoint/bin/classes/org/feup/bondpoint/R$id.class
	BondPoint/bin/classes/org/feup/bondpoint/R$layout.class
	BondPoint/bin/classes/org/feup/bondpoint/R$menu.class
	BondPoint/bin/classes/org/feup/bondpoint/R$string.class
	BondPoint/bin/classes/org/feup/bondpoint/R$strings.class
	BondPoint/bin/classes/org/feup/bondpoint/R$style.class
	BondPoint/bin/classes/org/feup/bondpoint/R$styleable.class
	BondPoint/bin/jarlist.cache
	BondPoint/gen/com/facebook/android/R.java
	BondPoint/gen/org/feup/bondpoint/R.java
	BondPoint/project.properties
	BondPoint/res/values/strings.xml