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

Conflicts:
	BondPoint/bin/R.txt
	BondPoint/bin/jarlist.cache
	BondPoint/gen/org/feup/bondpoint/R.java