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

Conflicts:
	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$5.class
	BondPoint/bin/classes/org/feup/bondpoint/ConnectActivity$6.class
	BondPoint/bin/classes/org/feup/bondpoint/ConnectActivity$7.class
	BondPoint/bin/classes/org/feup/bondpoint/ConnectActivity.class
	BondPoint/src/org/feup/bondpoint/ConnectActivity.java